guix-install.sh: Source both profiles, default user's and home.
* etc/guix-install.sh (sys_create_init_profile): Source both profiles, default user's and home.
This commit is contained in:
		
							parent
							
								
									65c8ffecd9
								
							
						
					
					
						commit
						6ff460d010
					
				
					 1 changed files with 11 additions and 6 deletions
				
			
		| 
						 | 
					@ -11,6 +11,7 @@
 | 
				
			||||||
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 | 
					# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 | 
				
			||||||
# Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 | 
					# Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 | 
				
			||||||
# Copyright © 2022 Prafulla Giri <prafulla.giri@protonmail.com>
 | 
					# Copyright © 2022 Prafulla Giri <prafulla.giri@protonmail.com>
 | 
				
			||||||
 | 
					# Copyright © 2023 Andrew Tropin <andrew@trop.in>
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# This file is part of GNU Guix.
 | 
					# This file is part of GNU Guix.
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					@ -549,15 +550,19 @@ export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
 | 
				
			||||||
# searches 'Info-default-directory-list'.
 | 
					# searches 'Info-default-directory-list'.
 | 
				
			||||||
export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
 | 
					export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# GUIX_PROFILE: User's default profile
 | 
					# GUIX_PROFILE: User's default profile and home profile
 | 
				
			||||||
# Prefer the one from 'guix home' if it exists.
 | 
					GUIX_PROFILE="$HOME/.guix-profile"
 | 
				
			||||||
 | 
					[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
 | 
				
			||||||
 | 
					[ -L "$GUIX_PROFILE" ] || \
 | 
				
			||||||
 | 
					GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GUIX_PROFILE="$HOME/.guix-home/profile"
 | 
					GUIX_PROFILE="$HOME/.guix-home/profile"
 | 
				
			||||||
[ -L $GUIX_PROFILE ] || GUIX_PROFILE="$HOME/.guix-profile"
 | 
					[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
 | 
				
			||||||
[ -L $GUIX_PROFILE ] || return
 | 
					[ -L "$GUIX_PROFILE" ] || \
 | 
				
			||||||
GUIX_LOCPATH="$GUIX_PROFILE/lib/locale"
 | 
					GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export GUIX_LOCPATH
 | 
					export GUIX_LOCPATH
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
 | 
					 | 
				
			||||||
EOF
 | 
					EOF
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue