diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-10-08 19:24:34 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-08 19:24:34 +0200 |
commit | d1f3b333e6176a7879ab3742bbebb2a99f61a528 (patch) | |
tree | 8bd82ce68bd2534a48bf13c7256997f82dd1b3f4 /gnu/packages/patches/xfce4-session-fix-xflock4.patch | |
parent | e01d384efcdaf564bbb221e43b81e087c8e2af06 (diff) | |
parent | 861907f01efb1cae7f260e8cb7b991d5034a486a (diff) | |
download | guix-patches-d1f3b333e6176a7879ab3742bbebb2a99f61a528.tar guix-patches-d1f3b333e6176a7879ab3742bbebb2a99f61a528.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/xfce4-session-fix-xflock4.patch')
-rw-r--r-- | gnu/packages/patches/xfce4-session-fix-xflock4.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/gnu/packages/patches/xfce4-session-fix-xflock4.patch b/gnu/packages/patches/xfce4-session-fix-xflock4.patch deleted file mode 100644 index 74769e4257..0000000000 --- a/gnu/packages/patches/xfce4-session-fix-xflock4.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cbb9c769316b4d32956a2c78aa01a38b473f0cfc Mon Sep 17 00:00:00 2001 -From: David Thompson <dthompson2@worcester.edu> -Date: Fri, 30 Oct 2015 08:30:43 -0400 -Subject: [PATCH] xflock4: Do not override PATH with hardcoded value. - -The PATH "/bin:/usr/bin" may not be a valid search path on the user's -machine. The screen locking program may be in /usr/local/bin or -elsewhere. Distros that do not conform to the FHS, such as GuixSD and -NixOS, will not have their executables in either location. Thus, we -simply leave PATH alone. ---- - scripts/xflock4 | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/scripts/xflock4 b/scripts/xflock4 -index ec4d05d..e7981ac 100644 ---- a/scripts/xflock4 -+++ b/scripts/xflock4 -@@ -21,9 +21,6 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - # - --PATH=/bin:/usr/bin --export PATH -- - # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running - for lock_cmd in \ - "xscreensaver-command -lock" \ --- -2.5.0 - |