aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-06-12 15:04:52 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-12 15:23:34 +0200
commit8d09bfe21870c2d5fdb1cd04bc5fdcab177204b0 (patch)
tree0d4d4f33d1093ca95e4754774ae88b941a77e86f
parent90977eb55efa0a005c52ec41fdb0edd67f2af5cb (diff)
downloadguix-8d09bfe21870c2d5fdb1cd04bc5fdcab177204b0.tar
guix-8d09bfe21870c2d5fdb1cd04bc5fdcab177204b0.tar.gz
system: Move ~/.config/guix/current first in PATH and INFOPATH.
Fixes <https://bugs.gnu.org/31770>. Reported by iyzsong@member.fsf.org (宋文武). * gnu/system.scm (operating-system-etc-service)["profile"]: Arrange so that ~/.config/guix/current comes first in PATH and INFOPATH.
-rw-r--r--gnu/system.scm8
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