[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: singularity: Do not override PATH.
From: |
guix-commits |
Subject: |
02/02: gnu: singularity: Do not override PATH. |
Date: |
Tue, 17 Oct 2023 08:13:59 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 018567adb7b2d31d0bd457983b755ec3063d08c6
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Oct 17 13:57:34 2023 +0200
gnu: singularity: Do not override PATH.
* gnu/packages/linux.scm (singularity)[arguments]: Prepend coreutils, but
don't make it impossible to pick up other tools.
---
gnu/packages/linux.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3c34919766..6cd9540da3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5239,9 +5239,11 @@ thanks to the use of namespaces.")
(add-after 'install 'set-PATH
(lambda _
;; Have the 'singularity' and 'run-singularity' self-sufficient.
+ ;; But don't override PATH, so that other tools like zcat and
+ ;; tar can still be found if they are available.
(let ((coreutils #$(this-package-input "coreutils")))
(wrap-program (string-append #$output "/bin/singularity")
- `("PATH" ":" = (,(string-append coreutils "/bin"))))
+ `("PATH" prefix (,(string-append coreutils "/bin"))))
(substitute* (string-append #$output "/bin/run-singularity")
(("/usr/bin/env singularity")
(string-append (which "env") " "