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
parent
3fdb01f1f5
commit
8e344e3677
|
@ -4045,18 +4045,18 @@ thanks to the use of namespaces.")
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'patch-references
|
(add-after 'unpack 'patch-references
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "libexec/cli/build.exec"
|
(substitute* "libexec/cli/build.exec.in"
|
||||||
(("if ! singularity_which mksquashfs") "if 0")
|
(("-mksquashfs") (string-append "-" (which "mksquashfs"))))
|
||||||
(("if ! mksquashfs")
|
(substitute* (append
|
||||||
(string-append "if ! " (which "mksquashfs"))))
|
(find-files "libexec" "functions")
|
||||||
(substitute* (list "libexec/cli/help.exec"
|
(find-files "libexec/bootstrap-scripts" ".*sh$")
|
||||||
"libexec/bootstrap-scripts/functions"
|
(find-files "libexec/cli" ".*exec$"))
|
||||||
"libexec/bootstrap-scripts/post.sh"
|
|
||||||
"libexec/functions")
|
|
||||||
(("\\| grep ")
|
(("\\| grep ")
|
||||||
(string-append "| " (which "grep") " "))
|
(string-append "| " (which "grep") " "))
|
||||||
(("egrep ")
|
(("egrep ")
|
||||||
(string-append (which "egrep") " ")))
|
(string-append (which "egrep") " "))
|
||||||
|
((" sed ")
|
||||||
|
(string-append " " (which "sed") " ")))
|
||||||
#t))
|
#t))
|
||||||
(add-after 'install 'set-PATH
|
(add-after 'install 'set-PATH
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
|
Reference in New Issue