nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28004 from moesasji/master

Browse Source 
xfce4-session: fix lock screen not working with light-locker
This commit is contained in:
Wout Mertens 2017-08-07 18:40:48 +02:00 committed by GitHub
commit b6f19f79aa
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/desktops/xfce/core/xfce4-light-locker.patch Normal file
View File

@ -0,0 +1,16 @@
--- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100
+++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100
@@ -24,10 +24,11 @@
PATH=/bin:/usr/bin
export PATH
-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
+# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective daemon is running
for lock_cmd in \
"xscreensaver-command -lock" \
- "gnome-screensaver-command --lock"
+ "gnome-screensaver-command --lock" \
+ "light-locker-command -l"
do
$lock_cmd >/dev/null 2>&1 && exit
done

5
pkgs/desktops/xfce/core/xfce4-session.nix
View File

@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd";
};
patches = [
# Fix "lock screen" not working for light-locker
./xfce4-light-locker.patch
];
buildInputs =
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
xfconf xfce4panel libglade xorg.iceauth xorg.libSM