03/04: gnu: singularity: Leave PATH unchanged.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit af857579156d0496111643ddc874e08b7b021de1
Author: Ludovic Courtès <address@hidden>
Date:   Tue Mar 5 18:38:11 2019 +0100

    gnu: singularity: Leave PATH unchanged.
    
    Previously 'singularity help' & co. would all fail on Guix System
    because Coreutils, grep, etc. were not found in $PATH.
    
    * gnu/packages/linux.scm (singularity)[source](snippet): Remove "PATH"
    setting from 'bin/singularity.in'.
---
 gnu/packages/linux.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e4cfc54..7ee139b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2663,6 +2663,14 @@ thanks to the use of namespaces.")
                   ;; Do not create directories in /var.
                   (substitute* "Makefile.in"
                     (("\\$\\(MAKE\\) .*install-data-hook") ""))
+
+                  ;; The original source overrides PATH so that it points to
+                  ;; /bin, /usr/local/bin, etc., which obviously doesn't work
+                  ;; on Guix System.  Leave PATH unchanged so we refer to the
+                  ;; installed Coreutils, grep, etc.
+                  (substitute* "bin/singularity.in"
+                    (("^PATH=.*" all)
+                     (string-append "#" all "\n")))
                   #t))))
     (build-system gnu-build-system)
     (arguments