me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Efraim Flashner 2020-12-10 14:22:20 +02:00
parent 3fdb01f1f5
commit 8e344e3677
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/linux.scm
View File

@ -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)