nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mc: Substitute more FHS file names. 

* gnu/packages/mc.scm (mc)[arguments]: Add some more files to the
‘patch-FHS-file-names’ phase.
This commit is contained in:
Tobias Geerinckx-Rice 2018-02-08 00:47:58 +01:00
parent 0b18c0b0de
commit b2d00af723
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/mc.scm
View File

@ -62,14 +62,25 @@
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-FHS-file-names (add-after 'patch-source-shebangs 'patch-FHS-file-names
(lambda _ (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" (substitute* "misc/mcedit.menu.in"
(("#! /bin/sh") (string-append "#!" (which "sh"))) (("#! /bin/sh") (string-append "#!" (which "sh")))
(("/bin/bash") (which "bash"))) (("/bin/bash") (which "bash")))
(substitute* "misc/ext.d/misc.sh.in" (substitute* "misc/ext.d/misc.sh.in"
(("/bin/cat") "cat")) (("/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"))) (("/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)) #t))
(add-before 'check 'fix-tests (add-before 'check 'fix-tests
(lambda _ (lambda _