guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/08: guix-install.sh: /etc/profile.d/guix.sh sources ~/.guix-profile/e


From: guix-commits
Subject: 03/08: guix-install.sh: /etc/profile.d/guix.sh sources ~/.guix-profile/etc/profile.
Date: Sat, 21 Mar 2020 19:02:35 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit e69b8bbae918768487a073e4aad8c08fd662b80b
Author: Ludovic Court├Ęs <address@hidden>
AuthorDate: Sat Mar 21 23:27:12 2020 +0100

    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(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index d7fde7a..4909d3f 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/}"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]