diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-18 15:29:38 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-18 15:29:38 +0200 |
| commit | 6969c4de445a390eaa05de22bc5a537a76a76169 (patch) | |
| tree | 9df3bdde497fdce705ae4eb66972f93a9ae111d9 /gnu/system.scm | |
| parent | 73d18915b597f2a386d6ae42930b49a13c8813b0 (diff) | |
| parent | 32eb44240db23b2320a68a3ab17370531945587f (diff) | |
| download | guix-6969c4de445a390eaa05de22bc5a537a76a76169.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index e6118d3415..7cb12a8276 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -602,7 +602,7 @@ directory." # because they would require combining both profiles. # FIXME: See <http://bugs.gnu.org/20255>. export MANPATH=$HOME/.guix-profile/share/man:/run/current-system/profile/share/man -export INFOPATH=$HOME/.config/guix/current/share/info:$HOME/.guix-profile/share/info:/run/current-system/profile/share/info +export INFOPATH=$HOME/.guix-profile/share/info:/run/current-system/profile/share/info export XDG_DATA_DIRS=$HOME/.guix-profile/share:/run/current-system/profile/share export XDG_CONFIG_DIRS=$HOME/.guix-profile/etc/xdg:/run/current-system/profile/etc/xdg @@ -630,7 +630,8 @@ then export `cat /etc/environment | cut -d= -f1` fi -for profile in \"$HOME/.config/guix/current\" \"$HOME/.guix-profile\" +# Arrange so that ~/.config/guix/current comes first. +for profile in \"$HOME/.guix-profile\" \"$HOME/.config/guix/current\" do if [ -f \"$profile/etc/profile\" ] then @@ -644,6 +645,9 @@ do fi done +# Arrange so that ~/.config/guix/current/share/info comes first. +export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\" + # Set the umask, notably for users logging in via 'lsh'. # See <http://bugs.gnu.org/22650>. umask 022 |