diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-09-14 22:49:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-09-21 23:05:38 +0200 |
| commit | 9b65281de51bcb56714509524f5ae0731c9b96d0 (patch) | |
| tree | ffbbdf71c7e41a134a4e3bbfbce1a752ea7231be /guix/scripts/environment.scm | |
| parent | a2b25890ee37c017bc77a6b923577f258fa3fba0 (diff) | |
| download | guix-9b65281de51bcb56714509524f5ae0731c9b96d0.tar guix-9b65281de51bcb56714509524f5ae0731c9b96d0.tar.gz | |
environment: '--link-profile' uses ~/.guix-profile for environment variables.
Before this patch, we had:
$ guix environment -CP --ad-hoc coreutils
[env]$ echo $PATH
/gnu/store/…-profile/bin
[env]$ echo $GUIX_ENVIRONMENT
/gnu/store/…-profile
After this patch:
$ guix environment -CP --ad-hoc coreutils
[env]$ echo $PATH
/home/ludo/.guix-profile/bin
[env]$ echo $GUIX_ENVIRONMENT
/home/ludo/.guix-profile
* guix/scripts/environment.scm (launch-environment/container): When
LINK-PROFILE? is true, pass ~/.guix-profile as the second argument to
'launch-environment'.
* tests/guix-environment-container.sh: Adjust test accordingly.
* doc/guix.texi (Invoking guix environment): Update accordingly.
Diffstat (limited to 'guix/scripts/environment.scm')
| -rw-r--r-- | guix/scripts/environment.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index ad50281eb2..e2e481dd02 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -564,7 +564,11 @@ WHILE-LIST." (primitive-exit/status ;; A container's environment is already purified, so no need to ;; request it be purified again. - (launch-environment command profile manifest #:pure? #f))) + (launch-environment command + (if link-profile? + (string-append home-dir "/.guix-profile") + profile) + manifest #:pure? #f))) #:guest-uid uid #:guest-gid gid #:namespaces (if network? |