diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-03-21 23:27:12 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-03-22 00:02:23 +0100 |
| commit | e69b8bbae918768487a073e4aad8c08fd662b80b (patch) | |
| tree | 4a48ee62bbaab13052904113ded8131bc8023bb5 | |
| parent | 3c69701f9735dd62a2f765b8bd23a7eaeb391412 (diff) | |
| download | patches-e69b8bbae918768487a073e4aad8c08fd662b80b.tar patches-e69b8bbae918768487a073e4aad8c08fd662b80b.tar.gz | |
guix-install.sh: /etc/profile.d/guix.sh sources ~/.guix-profile/etc/profile.
* etc/guix-install.sh (sys_create_init_profile): Source
~/.guix-profile/etc/profile instead of running 'guix package
--search-paths=prefix'
| -rwxr-xr-x | etc/guix-install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index d7fde7aacd..4909d3f162 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -425,7 +425,7 @@ GUIX_PROFILE="$HOME/.guix-profile" GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" export GUIX_PROFILE GUIX_LOCPATH -eval `guix package --search-paths=prefix 2> /dev/null` +[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" # set XDG_DATA_DIRS to include Guix installations export XDG_DATA_DIRS="$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" |