Merge pull request #28004 from moesasji/master

xfce4-session: fix lock screen not working with light-locker

authored by Wout Mertens and committed by GitHub b6f19f79 67ed1599

+21
+16
pkgs/desktops/xfce/core/xfce4-light-locker.patch
··· 1 + --- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100 2 + +++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100 3 + @@ -24,10 +24,11 @@ 4 + PATH=/bin:/usr/bin 5 + export PATH 6 + 7 + -# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running 8 + +# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective daemon is running 9 + for lock_cmd in \ 10 + "xscreensaver-command -lock" \ 11 + - "gnome-screensaver-command --lock" 12 + + "gnome-screensaver-command --lock" \ 13 + + "light-locker-command -l" 14 + do 15 + $lock_cmd >/dev/null 2>&1 && exit 16 + done
+5
pkgs/desktops/xfce/core/xfce4-session.nix
··· 16 16 sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd"; 17 17 }; 18 18 19 + patches = [ 20 + # Fix "lock screen" not working for light-locker 21 + ./xfce4-light-locker.patch 22 + ]; 23 + 19 24 buildInputs = 20 25 [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib 21 26 xfconf xfce4panel libglade xorg.iceauth xorg.libSM