03/03: gnu: singularity: Refer to egrep.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 338f5428d6ca1a76a80e8378650d8b8b5e0600d4
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Jul 14 02:00:25 2020 +0200

    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.
---
 gnu/packages/linux.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9fa7d0c..80f546e 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)