tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: singularity: Do not override PATH.

Browse Source 
* gnu/packages/linux.scm (singularity)[arguments]: Prepend coreutils, but
don't make it impossible to pick up other tools.
This commit is contained in:
Ricardo Wurmus
2023-10-17 13:57:34 +02:00
parent 2fb94a505b
commit 018567adb7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/linux.scm
View File

@@ -5239,9 +5239,11 @@ thanks to the use of namespaces.")
(add-after 'install 'set-PATH (add-after 'install 'set-PATH
(lambda _ (lambda _
;; Have the 'singularity' and 'run-singularity' self-sufficient. ;; 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"))) (let ((coreutils #$(this-package-input "coreutils")))
(wrap-program (string-append #$output "/bin/singularity") (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") (substitute* (string-append #$output "/bin/run-singularity")
(("/usr/bin/env singularity") (("/usr/bin/env singularity")
(string-append (which "env") " " (string-append (which "env") " "