amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pack: Singularity environemt sources the profile's 'etc/profile'.

Browse source 
Fixes #419 where the same search path is used multiple times, leading to the
last one overriding the previous one.

The solution relies on the #$profile/etc/profile file that is already verified
and in case of errors, it is just one place to repair instead of repairing at
multiple places, like in singularity-environment-file

* guix/pack.scm (singularity-environment-file): Source #$profile/etc/profile

Reported-by: Alexis Simon <alexis.simon@runbox.com>
Change-Id: Ic304fef99ad34d83e4e10cdd2b26d3b1802b5251
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Rutherther 2025-06-04 16:34:29 +02:00 • committed by Ludovic Courtès
parent 1f1b65ddbc
commit 65bb0d92d8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
guix/scripts/pack.scm
View file

@ -312,25 +312,12 @@ added to the pack."
"Return a shell script that defines the environment variables corresponding "Return a shell script that defines the environment variables corresponding
to the search paths of PROFILE." to the search paths of PROFILE."
(define build (define build
(with-extensions (list guile-gcrypt) #~(begin
(with-imported-modules `(((guix config) => ,(make-config.scm)) (use-modules (ice-9 match))
,@(source-module-closure
`((guix profiles)
(guix search-paths))
#:select? not-config?))
#~(begin
(use-modules (guix profiles) (guix search-paths)
(ice-9 match))
(call-with-output-file #$output (call-with-output-file #$output
(lambda (port) (lambda (port)
(for-each (match-lambda (format port ". ~a/etc/profile~%" #$profile)))))
((spec . value)
(format port "~a=~a~%export ~a~%"
(search-path-specification-variable spec)
value
(search-path-specification-variable spec))))
(profile-search-paths #$profile))))))))
(computed-file "singularity-environment.sh" build)) (computed-file "singularity-environment.sh" build))