From af857579156d0496111643ddc874e08b7b021de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Mar 2019 18:38:11 +0100 Subject: 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 e4cfc546c0..7ee139b990 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 -- cgit v1.2.1