Merge pull request #21263 from Balletie/master

light-locker: use systemd/logind instead of UPower

pkgs/misc/screensavers/light-locker/default.nix

@@ -5,6 +5,8 @@
 , glib
 , pkgconfig
 , libX11
+, libXScrnSaver
+, libXxf86misc
 , gtk3
 , dbus_glib
 , systemd
@@ -23,18 +25,33 @@ stdenv.mkDerivation rec {
     sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj";
   };
 
-  buildInputs = [ which xfce.xfce4_dev_tools glib pkgconfig libX11 gtk3 dbus_glib systemd wrapGAppsHook ];
+  # Patch so that systemd is "found" when configuring.
+  patches = [ ./systemd.patch ];
+
+  buildInputs = [ which xfce.xfce4_dev_tools glib systemd pkgconfig
+                  libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ];
 
   preConfigure = ''
     ./autogen.sh
   '';
 
+  configureFlags = [ "--with-xf86gamma-ext" "--with-mit-ext"
+                     "--with-dpms-ext" "--with-systemd"
+                     # ConsoleKit and UPower were dropped in favor
+                     # of systemd replacements
+                     "--without-console-kit" "--without-upower" ];
+
   meta = with stdenv.lib; {
     homepage = https://github.com/the-cavalry/light-locker;
-    description = "Light-locker is a simple locker";
+    description = "A simple session-locker for LightDM";
     longDescription = ''
-      light-locker is a simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with the desktop while not carrying any desktop-specific dependencies.
+      A simple locker (forked from gnome-screensaver) that aims to
-      It relies on lightdm for locking and unlocking your session via ConsoleKit/UPower or logind/systemd.
+      have simple, sane, secure defaults and be well integrated with
+      the desktop while not carrying any desktop-specific
+      dependencies.
+
+      It relies on LightDM for locking and unlocking your session via
+      ConsoleKit/UPower or logind/systemd.
     '';
     license = licenses.gpl2;
     maintainers = with maintainers; [ obadz ];

pkgs/misc/screensavers/light-locker/systemd.patch

@@ -0,0 +1,13 @@
+diff --git a/configure.ac.in b/configure.ac.in
+index f7d5f5d..341bc83 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -424,7 +424,7 @@ AC_ARG_WITH(systemd,
+             [with_systemd=$withval], [with_systemd=auto])
+ 
+ PKG_CHECK_MODULES(SYSTEMD,
+-                  [libsystemd-login],
++                  [libsystemd],
+                   [have_systemd=yes], [have_systemd=no])
+ 
+ if test "x$with_systemd" = "xauto" ; then