diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-06-09 10:36:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-06-09 12:02:28 +0200 |
| commit | cdc5b9320f34a73b0a05a8915872e2aa21ff1197 (patch) | |
| tree | a8455698d4138a951c05ed229e823b599fc281f3 | |
| parent | 24cb66d18e37162721d636c277838718d3b23966 (diff) | |
| download | guix-cdc5b9320f34a73b0a05a8915872e2aa21ff1197.tar.gz guix-cdc5b9320f34a73b0a05a8915872e2aa21ff1197.zip | |
system: Honor ~/.config/guix/current in /etc/profile.
* gnu/system.scm (operating-system-etc-service)[profile]: Add
~/.config/guix/current/share/info to INFOPATH. Treat ~/.guix-profile
and ~/.config/guix/current in the same way.
| -rw-r--r-- | gnu/system.scm | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index f3dafd144b..e6118d3415 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/.guix-profile/share/info:/run/current-system/profile/share/info +export INFOPATH=$HOME/.config/guix/current/share/info:$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,16 +630,19 @@ then export `cat /etc/environment | cut -d= -f1` fi -if [ -f \"$HOME/.guix-profile/etc/profile\" ] -then - # Load the user profile's settings. - GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\ - . \"$HOME/.guix-profile/etc/profile\" -else - # At least define this one so that basic things just work - # when the user installs their first package. - export PATH=\"$HOME/.guix-profile/bin:$PATH\" -fi +for profile in \"$HOME/.config/guix/current\" \"$HOME/.guix-profile\" +do + if [ -f \"$profile/etc/profile\" ] + then + # Load the user profile's settings. + GUIX_PROFILE=\"$profile\" ; \\ + . \"$profile/etc/profile\" + else + # At least define this one so that basic things just work + # when the user installs their first package. + export PATH=\"$profile/bin:$PATH\" + fi +done # Set the umask, notably for users logging in via 'lsh'. # See <http://bugs.gnu.org/22650>. |