diff options
author | Christopher Baines <mail@cbaines.net> | 2024-03-20 14:54:26 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2024-03-20 14:54:26 +0000 |
commit | 8fa07612644339a2bf21be9ee924e6ff1e0ec81d (patch) | |
tree | dbcb73053fac420077d45b20d9460134818ad2be /doc/guix-cookbook.texi | |
parent | ebe30c375495e7232551b32b6771f3c06a676f41 (diff) | |
parent | 69951a61a1d8f1f2135ea2dc836738be282b97bc (diff) | |
download | guix-8fa07612644339a2bf21be9ee924e6ff1e0ec81d.tar.gz guix-8fa07612644339a2bf21be9ee924e6ff1e0ec81d.zip |
Merge remote-tracking branch 'savannah/master' into gnome-team
Change-Id: Iec8e15b79c6fde516294c2bfcaf8ee3575b1f745
Diffstat (limited to 'doc/guix-cookbook.texi')
-rw-r--r-- | doc/guix-cookbook.texi | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 2366c13caf..e7ef5fa784 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -22,7 +22,7 @@ Copyright @copyright{} 2020 André Batista@* Copyright @copyright{} 2020 Christine Lemmer-Webber@* Copyright @copyright{} 2021 Joshua Branson@* Copyright @copyright{} 2022, 2023 Maxim Cournoyer@* -Copyright @copyright{} 2023 Ludovic Courtès@* +Copyright @copyright{} 2023-2024 Ludovic Courtès@* Copyright @copyright{} 2023 Thomas Ieong Permission is granted to copy, distribute and/or modify this document @@ -5299,14 +5299,17 @@ export LC_ALL For convenience, @code{guix package} automatically generates @file{~/.guix-profile/etc/profile}, which defines all the environment variables necessary to use the packages---@code{PATH}, -@code{C_INCLUDE_PATH}, @code{PYTHONPATH}, etc. Thus it's a good idea to -source it from @code{/etc/profile}: +@code{C_INCLUDE_PATH}, @code{PYTHONPATH}, etc. Likewise, @command{guix +pull} does that under @file{~/.config/guix/current}. Thus it's a good +idea to source both from @code{/etc/profile}: @example -GUIX_PROFILE="$HOME/.guix-profile" -if [ -f "$GUIX_PROFILE/etc/profile" ]; then - . "$GUIX_PROFILE/etc/profile" -fi +for GUIX_PROFILE in "$HOME/.config/guix/current" "$HOME/.guix-profile" +do + if [ -f "$GUIX_PROFILE/etc/profile" ]; then + . "$GUIX_PROFILE/etc/profile" + fi +done @end example Last but not least, Guix provides command-line completion notably for |