jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #116136 from eadwu/clightd/5.2

Browse Source 
clightd: 5.1 -> 5.2
This commit is contained in:
Sandro 2021-03-29 14:33:00 +02:00 committed by GitHub
commit 5bf0e509b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/misc/clight/clightd.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch { lib, stdenv, fetchFromGitHub
, dbus, cmake, pkg-config , dbus, cmake, pkg-config
, glib, udev, polkit, libusb1, libjpeg, libmodule , glib, udev, polkit, libusb1, libjpeg, libmodule
, pcre, libXdmcp, util-linux, libpthreadstubs , pcre, libXdmcp, util-linux, libpthreadstubs
@ -9,42 +9,34 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clightd"; pname = "clightd";
version = "5.1"; version = "5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FedeDP"; owner = "FedeDP";
repo = "Clightd"; repo = "Clightd";
rev = version; rev = version;
sha256 = "sha256-BEGum0t+FrCTAEQwTsWeYpoIqimTAz+Bv/ZQPQ3fePY="; sha256 = "sha256-bb+PQsWLf4KnbzWUY6B42yHaDQKN9dtyfwSLe8FBaWU=";
}; };
patches = [
# Not needed by next version bump
(fetchpatch {
url = "https://github.com/FedeDP/Clightd/commit/a52a2888e3798c572dad359a017cb0d40e7c5fb7.patch";
sha256 = "sha256-nUzNBia1EvBQxinAfjyKbuldBoHLY1hfMaxgG2lKQWg=";
})
];
# dbus-1.pc has datadir=/etc # dbus-1.pc has datadir=/etc
SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services"; SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services";
# systemd.pc has prefix=${systemd.out}
MODULE_LOAD_DIR = "${placeholder "out"}/lib/modules-load.d";
# polkit-gobject-1.pc has prefix=${polkit.out} # polkit-gobject-1.pc has prefix=${polkit.out}
POLKIT_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions"; POLKIT_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions";
postPatch = '' postPatch = ''
sed -i "s@/etc@$out\0@" CMakeLists.txt
sed -i "s@pkg_get_variable(SYSTEM_BUS_DIR.*@set(SYSTEM_BUS_DIR $SYSTEM_BUS_DIR)@" CMakeLists.txt sed -i "s@pkg_get_variable(SYSTEM_BUS_DIR.*@set(SYSTEM_BUS_DIR $SYSTEM_BUS_DIR)@" CMakeLists.txt
sed -i "s@pkg_get_variable(MODULE_LOAD_DIR.*@set(MODULE_LOAD_DIR $MODULE_LOAD_DIR)@" CMakeLists.txt
sed -i "s@pkg_get_variable(POLKIT_ACTION_DIR.*@set(POLKIT_ACTION_DIR $POLKIT_ACTION_DIR)@" CMakeLists.txt sed -i "s@pkg_get_variable(POLKIT_ACTION_DIR.*@set(POLKIT_ACTION_DIR $POLKIT_ACTION_DIR)@" CMakeLists.txt
''; '';
cmakeFlags = with lib; cmakeFlags = with lib;
optional enableDdc "-DENABLE_DDC=1" [ "-DSYSTEMD_SERVICE_DIR=${placeholder "out"}/lib/systemd/system"
++ optional enableDpms "-DENABLE_DPMS=1" "-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d"
++ optional enableGamma "-DENABLE_GAMMA=1" # systemd.pc has prefix=${systemd.out}
++ optional enableScreen "-DENABLE_SCREEN=1"; "-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d"
] ++ optional enableDdc "-DENABLE_DDC=1"
++ optional enableDpms "-DENABLE_DPMS=1"
++ optional enableGamma "-DENABLE_GAMMA=1"
++ optional enableScreen "-DENABLE_SCREEN=1";
nativeBuildInputs = [ nativeBuildInputs = [
dbus dbus