nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2018-06-12 15:04:52 +02:00
parent 90977eb55e
commit 8d09bfe218
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/system.scm
View File

@ -602,7 +602,7 @@ directory."
# because they would require combining both profiles. # because they would require combining both profiles.
# FIXME: See <http://bugs.gnu.org/20255>. # FIXME: See <http://bugs.gnu.org/20255>.
export MANPATH=$HOME/.guix-profile/share/man:/run/current-system/profile/share/man 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_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 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` export `cat /etc/environment | cut -d= -f1`
fi 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 do
if [ -f \"$profile/etc/profile\" ] if [ -f \"$profile/etc/profile\" ]
then then
@ -644,6 +645,9 @@ do
fi fi
done 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'. # Set the umask, notably for users logging in via 'lsh'.
# See <http://bugs.gnu.org/22650>. # See <http://bugs.gnu.org/22650>.
umask 022 umask 022