[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: singularity: Update command substitutions.
From: |
guix-commits |
Subject: |
branch master updated: gnu: singularity: Update command substitutions. |
Date: |
Thu, 10 Dec 2020 07:23:42 -0500 |
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 8e344e3 gnu: singularity: Update command substitutions.
8e344e3 is described below
commit 8e344e36771e35702ab3e4bef72529dcd3498809
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Dec 10 14:22:20 2020 +0200
gnu: singularity: Update command substitutions.
Reported by Hao Chen <hchen@uthsc.edu>.
* gnu/packages/linux.scm (singularity)[arguments]: Update
'patch-references phase to actually patch mksquashfs calls and to patch
sed calls.
---
gnu/packages/linux.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ee460c3..4b1fe7e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4045,18 +4045,18 @@ thanks to the use of namespaces.")
(modify-phases %standard-phases
(add-after 'unpack 'patch-references
(lambda _
- (substitute* "libexec/cli/build.exec"
- (("if ! singularity_which mksquashfs") "if 0")
- (("if ! mksquashfs")
- (string-append "if ! " (which "mksquashfs"))))
- (substitute* (list "libexec/cli/help.exec"
- "libexec/bootstrap-scripts/functions"
- "libexec/bootstrap-scripts/post.sh"
- "libexec/functions")
+ (substitute* "libexec/cli/build.exec.in"
+ (("-mksquashfs") (string-append "-" (which "mksquashfs"))))
+ (substitute* (append
+ (find-files "libexec" "functions")
+ (find-files "libexec/bootstrap-scripts" ".*sh$")
+ (find-files "libexec/cli" ".*exec$"))
(("\\| grep ")
(string-append "| " (which "grep") " "))
(("egrep ")
- (string-append (which "egrep") " ")))
+ (string-append (which "egrep") " "))
+ ((" sed ")
+ (string-append " " (which "sed") " ")))
#t))
(add-after 'install 'set-PATH
(lambda* (#:key inputs outputs #:allow-other-keys)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: singularity: Update command substitutions.,
guix-commits <=