From 338f5428d6ca1a76a80e8378650d8b8b5e0600d4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Jul 2020 02:00:25 +0200 Subject: gnu: singularity: Refer to egrep. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (singularity)[arguments]: Rename ‘patch-reference-to-squashfs-tools’ to ‘patch-references’ and add egrep. Reported by slimjim on #guix. --- gnu/packages/linux.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9fa7d0cd54..80f546e056 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3937,12 +3937,18 @@ thanks to the use of namespaces.") `(#:configure-flags '("--localstatedir=/var") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-reference-to-squashfs-tools + (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") + (("egrep ") + (string-append (which "egrep") " "))) #t)) (add-after 'install 'set-PATH (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3