me
/
guix
Archived
1
0
Fork 0
Code

gnu: singularity: Refer to egrep. 

* gnu/packages/linux.scm (singularity)[arguments]: Rename
‘patch-reference-to-squashfs-tools’ to ‘patch-references’ and add egrep.

Reported by slimjim on #guix.
master
Tobias Geerinckx-Rice 2020-07-14 02:00:25 +02:00
parent 0ac65c8bed
commit 338f5428d6
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/linux.scm
View File

@ -3937,12 +3937,18 @@ thanks to the use of namespaces.")
`(#:configure-flags '("--localstatedir=/var") `(#:configure-flags '("--localstatedir=/var")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-reference-to-squashfs-tools (add-after 'unpack 'patch-references
(lambda _ (lambda _
(substitute* "libexec/cli/build.exec" (substitute* "libexec/cli/build.exec"
(("if ! singularity_which mksquashfs") "if 0") (("if ! singularity_which mksquashfs") "if 0")
(("if ! mksquashfs") (("if ! mksquashfs")
(string-append "if ! " (which "mksquashfs")))) (string-append "if ! " (which "mksquashfs"))))
(substitute* (list "libexec/cli/help.exec"
"libexec/bootstrap-scripts/functions"
"libexec/bootstrap-scripts/post.sh"
"libexec/functions")
(("egrep ")
(string-append (which "egrep") " ")))
#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)