aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-02-08 00:47:58 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2018-02-08 05:01:41 +0100
commitb2d00af723b900c6db7d6db5c5f5b20e9955840b (patch)
tree30b2458454c55b576518ca20e34cfcf6f8fd28ac /gnu/packages
parent0b18c0b0de9aabb12b4c1503303e4dde410f6470 (diff)
downloadguix-b2d00af723b900c6db7d6db5c5f5b20e9955840b.tar
guix-b2d00af723b900c6db7d6db5c5f5b20e9955840b.tar.gz
gnu: mc: Substitute more FHS file names.
* gnu/packages/mc.scm (mc)[arguments]: Add some more files to the ‘patch-FHS-file-names’ phase.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/mc.scm15
1 files changed, 13 insertions, 2 deletions
diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm
index 2e13c3201f..6c71f56086 100644
--- a/gnu/packages/mc.scm
+++ b/gnu/packages/mc.scm
@@ -62,14 +62,25 @@
(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-FHS-file-names
(lambda _
- ;; Patch files to refer to executables in the store.
+ ;; Patch files to refer to executables in the store or $PATH.
(substitute* "misc/mcedit.menu.in"
(("#! /bin/sh") (string-append "#!" (which "sh")))
(("/bin/bash") (which "bash")))
(substitute* "misc/ext.d/misc.sh.in"
(("/bin/cat") "cat"))
- (substitute* "tests/src/vfs/extfs/helpers-list/Makefile.in"
+ (substitute* (list "lib/utilunix.c"
+ "src/usermenu.c"
+ "src/vfs/fish/fish.c"
+ "tests/src/vfs/extfs/helpers-list/Makefile.in")
(("/bin/sh") (which "sh")))
+ (substitute* "src/filemanager/ext.c"
+ (("/bin/rm") "rm")
+ (("/bin/sh") (which "sh")))
+
+ ;; There are other /bin/<shell>s hard-coded in this file, but they
+ ;; are never tried after bash (mc's first choice) is found.
+ (substitute* "lib/shell.c"
+ (("/bin/bash") (which "bash")))
#t))
(add-before 'check 'fix-tests
(lambda _