diff options
| author | Leo Famulari <leo@famulari.name> | 2016-10-03 17:08:05 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-10-03 17:08:05 -0400 |
| commit | 9c2130757cc0ac20be3cb255c2c09ede45cc9826 (patch) | |
| tree | 2f06ff7fbde58022a6600f76f15d3734587f2ab0 /gnu/packages/patches/quickswitch-fix-dmenu-check.patch | |
| parent | e543c8a2c6bdc8f129d02a4b48ff336d0e7b529b (diff) | |
| parent | b38e97e03b92d54524953949934884828a1683c1 (diff) | |
| download | guix-9c2130757cc0ac20be3cb255c2c09ede45cc9826.tar guix-9c2130757cc0ac20be3cb255c2c09ede45cc9826.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/quickswitch-fix-dmenu-check.patch')
| -rw-r--r-- | gnu/packages/patches/quickswitch-fix-dmenu-check.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/gnu/packages/patches/quickswitch-fix-dmenu-check.patch b/gnu/packages/patches/quickswitch-fix-dmenu-check.patch new file mode 100644 index 0000000000..9c6cca47c6 --- /dev/null +++ b/gnu/packages/patches/quickswitch-fix-dmenu-check.patch @@ -0,0 +1,32 @@ +Fix check for dmenu (open file mode, dependency on which). + +See <https://github.com/proxypoke/quickswitch-for-i3/pull/24>. + +--- quickswitch-i3-2.2/quickswitch.py 2016-09-18 19:59:10.257765542 +0200 ++++ quickswitch-i3-2.2/quickswitch.py 2016-09-21 10:43:01.277577819 +0200 +@@ -24,9 +24,10 @@ + + import argparse + import subprocess +-import os + import re + ++from distutils.spawn import find_executable ++ + try: + import i3 + except ImportError: +@@ -37,11 +38,8 @@ + + def check_dmenu(): + '''Check if dmenu is available.''' +- devnull = open(os.devnull) +- retcode = subprocess.call(["which", "dmenu"], +- stdout=devnull, +- stderr=devnull) +- return True if retcode == 0 else False ++ executable = find_executable("dmenu") ++ return executable != None + + + def dmenu(options, dmenu): |