Merge master into staging-next

6 files changed, 47 insertions, 23 deletions

diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix
index 51c61ca28e7..547e7e0b6da 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/pkgs/applications/misc/clight/clightd.nix
@@ -1,23 +1,31 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub, fetchpatch
 , dbus, cmake, pkg-config
-, glib, udev, polkit, libmodule
+, glib, udev, polkit, libusb1, libjpeg, libmodule
 , pcre, libXdmcp, util-linux, libpthreadstubs
 , enableDdc ? true, ddcutil
 , enableDpms ? true, libXext
-, enableGamma ? true, libXrandr
+, enableGamma ? true, libdrm, libXrandr, wayland
 , enableScreen ? true }:
 
 stdenv.mkDerivation rec {
   pname = "clightd";
-  version = "4.2";
+  version = "5.1";
 
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "Clightd";
     rev = version;
-    sha256 = "07z1m1x7nnczd51sg7m2lb6rb2c37c8glsnbrlq44hx176sj9cmj";
+    sha256 = "sha256-BEGum0t+FrCTAEQwTsWeYpoIqimTAz+Bv/ZQPQ3fePY=";
   };
 
+  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}
@@ -48,19 +56,22 @@ stdenv.mkDerivation rec {
     glib
     udev
     polkit
+    libusb1
+    libjpeg
     libmodule
 
     pcre
     libXdmcp
     util-linux
     libpthreadstubs
-  ] ++ optional enableDdc ddcutil
-    ++ optional enableDpms libXext
-    ++ optional enableGamma libXrandr;
+  ] ++ optionals enableDdc [ ddcutil ]
+    ++ optionals enableDpms [ libXext ]
+    ++ optionals enableGamma [ libXrandr ]
+    ++ optionals (enableDpms || enableGamma || enableScreen) [ libdrm wayland ];
 
   postInstall = ''
     mkdir -p $out/bin
-    ln -svT $out/lib/clightd/clightd $out/bin/clightd
+    ln -svT $out/libexec/clightd $out/bin/clightd
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix
index 6ef2e886a19..e502cd6ccf3 100644
--- a/pkgs/applications/misc/clight/default.nix
+++ b/pkgs/applications/misc/clight/default.nix
@@ -6,24 +6,21 @@
 
 stdenv.mkDerivation rec {
   pname = "clight";
-  version = "4.1";
+  version = "4.2";
 
   src = fetchFromGitHub {
     owner = "FedeDP";
     repo = "Clight";
     rev = version;
-    sha256 = "1j7va217g1k8lxl3lly13js8myf0shjc6knalq8q6lakc6j1mkxx";
+    sha256 = "sha256-NmfnE6ZWgG9erBmrFFIhutnB1t2Ix/6jo+EeXYVtehg=";
   };
 
-  # bash-completion.pc completionsdir=${bash-completion.out}
-  COMPLETIONS_DIR = "${placeholder "out"}/share/bash-completions/completions";
   # dbus-1.pc has datadir=/etc
   SESSION_BUS_DIR = "${placeholder "out"}/share/dbus-1/services";
 
   postPatch = ''
     sed -i "s@/usr@$out@" CMakeLists.txt
     sed -i "s@/etc@$out\0@" CMakeLists.txt
-    sed -i "s@pkg_get_variable(COMPLETIONS_DIR.*@set(COMPLETIONS_DIR $COMPLETIONS_DIR)@" CMakeLists.txt
     sed -i "s@pkg_get_variable(SESSION_BUS_DIR.*@set(SESSION_BUS_DIR $SESSION_BUS_DIR)@" CMakeLists.txt
   '';
 
@@ -46,6 +43,12 @@ stdenv.mkDerivation rec {
   ] ++ optional withGeoclue geoclue2
     ++ optional withUpower upower;
 
+  cmakeFlags = [
+    # bash-completion.pc completionsdir=${bash-completion.out}
+    "-DBASH_COMPLETIONS_DIR=${placeholder "out"}/share/bash-completions/completions"
+    "-DZSH_COMPLETIONS_DIR=${placeholder "out"}/share/zsh/site-functions"
+  ];
+
   meta = with lib; {
     description = "A C daemon that turns your webcam into a light sensor";
     homepage = "https://github.com/FedeDP/Clight";
diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index 29816dea49e..88274b8664d 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/johanmalm/jgmenu";
     description = "Small X11 menu intended to be used with openbox and tint2";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];
   };
diff --git a/pkgs/applications/misc/openbox-menu/with-svg.patch b/pkgs/applications/misc/openbox-menu/000-enable-svg.patch
index dd6710f5cfc..dd6710f5cfc 100644
--- a/pkgs/applications/misc/openbox-menu/with-svg.patch
+++ b/pkgs/applications/misc/openbox-menu/000-enable-svg.patch
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 9d2695f97ff..71c7903dfe2 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, menu-cache }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, glib
+, gtk2
+, menu-cache
+}:
 
 stdenv.mkDerivation rec {
   pname = "openbox-menu";
@@ -12,11 +19,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib gtk2 menu-cache ];
 
-  patches = [ ./with-svg.patch ];
+  # Enables SVG support by uncommenting the Makefile
+  patches = [ ./000-enable-svg.patch ];
 
-  installPhase = "make install prefix=$out";
+  installFlags = [ "prefix=${placeholder "out"}" ];
 
-  meta = {
+  meta = with lib; {
     homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html";
     description = "Dynamic XDG menu generator for Openbox";
     longDescription = ''
@@ -24,8 +32,8 @@ stdenv.mkDerivation rec {
       dynamic menu listing installed applications. Most of the work is done by
       the LXDE library menu-cache.
     '';
-    license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.romildo ];
-    platforms   = lib.platforms.unix;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.romildo ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix
index 942384f78f7..4452f643474 100644
--- a/pkgs/applications/misc/tickrs/default.nix
+++ b/pkgs/applications/misc/tickrs/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub, perl }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, perl, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tickrs";
@@ -15,6 +15,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ perl ];
 
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with lib; {
     description = "Realtime ticker data in your terminal";
     homepage = "https://github.com/tarkah/tickrs";