[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: mc: Substitute more FHS file names.
From: |
Tobias Geerinckx-Rice |
Subject: |
01/05: gnu: mc: Substitute more FHS file names. |
Date: |
Wed, 7 Feb 2018 23:02:04 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit b2d00af723b900c6db7d6db5c5f5b20e9955840b
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Thu Feb 8 00:47:58 2018 +0100
gnu: mc: Substitute more FHS file names.
* gnu/packages/mc.scm (mc)[arguments]: Add some more files to the
‘patch-FHS-file-names’ phase.
---
gnu/packages/mc.scm | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm
index 2e13c32..6c71f56 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 _
- branch master updated (0b18c0b -> c283778), Tobias Geerinckx-Rice, 2018/02/07
- 05/05: gnu: nim: Update to 0.17.2., Tobias Geerinckx-Rice, 2018/02/07
- 03/05: gnu: luajit: Make available as ‘luajit’., Tobias Geerinckx-Rice, 2018/02/07
- 01/05: gnu: mc: Substitute more FHS file names.,
Tobias Geerinckx-Rice <=
- 04/05: gnu: luajit, lua5.x-bitop: Use HTTPS home pages., Tobias Geerinckx-Rice, 2018/02/07
- 02/05: gnu: luajit: Update to 2.1.0-beta3., Tobias Geerinckx-Rice, 2018/02/07