diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2017-08-07 18:40:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 18:40:48 +0200 |
| commit | b6f19f79aabdba3dec2eb993d7135f1b679bab20 (patch) | |
| tree | 7485a28fff9653c98d7f63780f219aea02c1ccc4 /pkgs/desktops | |
| parent | 67ed1599bc8b12cec457f1543665368107d1b45a (diff) | |
| parent | 71203503f9c3b69ae75b1c612d9e4665f9b37b5e (diff) | |
| download | nixlib-b6f19f79aabdba3dec2eb993d7135f1b679bab20.tar nixlib-b6f19f79aabdba3dec2eb993d7135f1b679bab20.tar.gz nixlib-b6f19f79aabdba3dec2eb993d7135f1b679bab20.tar.bz2 nixlib-b6f19f79aabdba3dec2eb993d7135f1b679bab20.tar.lz nixlib-b6f19f79aabdba3dec2eb993d7135f1b679bab20.tar.xz nixlib-b6f19f79aabdba3dec2eb993d7135f1b679bab20.tar.zst nixlib-b6f19f79aabdba3dec2eb993d7135f1b679bab20.zip | |
Merge pull request #28004 from moesasji/master
xfce4-session: fix lock screen not working with light-locker
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/xfce/core/xfce4-light-locker.patch | 16 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/core/xfce4-session.nix | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/pkgs/desktops/xfce/core/xfce4-light-locker.patch new file mode 100644 index 000000000000..4e1dcc1efa71 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-light-locker.patch @@ -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 diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index a0568b0dd395..edc810d38972 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -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 |