From e69b8bbae918768487a073e4aad8c08fd662b80b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 21 Mar 2020 23:27:12 +0100 Subject: 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' --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') 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/}" -- cgit 1.4.1