diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-29 14:33:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 14:33:00 +0200 |
| commit | 5bf0e509b56c5675cfba71900c88f733373650fb (patch) | |
| tree | cc469a2bc317f0d2bc1025302f431c67c32a3067 /pkgs/applications | |
| parent | dd66fff078e6231c73ed091b20ab18a5f751f2e6 (diff) | |
| parent | 0279db70edbdcde9d252fb796172955f8173eef9 (diff) | |
Merge pull request #116136 from eadwu/clightd/5.2
clightd: 5.1 -> 5.2
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/clight/clightd.nix | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index 547e7e0b6da9f..632a0d5d0e803 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , dbus, cmake, pkg-config , glib, udev, polkit, libusb1, libjpeg, libmodule , pcre, libXdmcp, util-linux, libpthreadstubs @@ -9,42 +9,34 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.1"; + version = "5.2"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; 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 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_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions"; 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(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 ''; cmakeFlags = with lib; - optional enableDdc "-DENABLE_DDC=1" - ++ optional enableDpms "-DENABLE_DPMS=1" - ++ optional enableGamma "-DENABLE_GAMMA=1" - ++ optional enableScreen "-DENABLE_SCREEN=1"; + [ "-DSYSTEMD_SERVICE_DIR=${placeholder "out"}/lib/systemd/system" + "-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d" + # systemd.pc has prefix=${systemd.out} + "-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 = [ dbus |