From 1262e8b12213a380aa2bb802f8b43ac53337b431 Mon Sep 17 00:00:00 2001
From: Trevor Arjeski <tmarjeski@gmail.com>
Date: Mon, 6 May 2024 09:00:59 +0300
Subject: guix-install.sh: Add ~/.guix-profile/share/info to INFOPATH.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding ~/.guix-profile/share/info to the INFOPATH env var so that when a user
does `guix install [package]` that package's info pages can be found.

* etc/guix-install.sh (sys_create_init_profile): Add
$GUIX_PROFILE/share/info to INFOPATH in ‘/etc/profile.d/zzz-guix.sh’.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: I8958261c388ddee5659f0f1ce1c0c9813dc0f052
---
 etc/guix-install.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'etc/guix-install.sh')

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 82accfd5d5..4e268a52d6 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -626,11 +626,6 @@ export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
 # _GUIX_PROFILE: `guix pull` profile
 _GUIX_PROFILE="$HOME/.config/guix/current"
 export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
-# Export INFOPATH so that the updated info pages can be found
-# and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info
-# When INFOPATH is unset, add a trailing colon so that Emacs
-# searches 'Info-default-directory-list'.
-export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
 
 # GUIX_PROFILE: User's default profile and home profile
 GUIX_PROFILE="$HOME/.guix-profile"
@@ -638,6 +633,12 @@ GUIX_PROFILE="$HOME/.guix-profile"
 [ -L "$GUIX_PROFILE" ] && \
 GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
 
+# Export INFOPATH so that the updated info pages can be found
+# and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info
+# When INFOPATH is unset, add a trailing colon so that Emacs
+# searches 'Info-default-directory-list'.
+export INFOPATH="$_GUIX_PROFILE/share/info:$GUIX_PROFILE/share/info:$INFOPATH"
+
 GUIX_PROFILE="$HOME/.guix-home/profile"
 [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
 [ -L "$GUIX_PROFILE" ] && \
-- 
cgit v1.2.3

d=6158472d8ef2ae3d29a4d2ac662fda481f10a2eb'>root</a>/<a href='/guix/log/etc?id=6158472d8ef2ae3d29a4d2ac662fda481f10a2eb'>etc</a>/<a href='/guix/log/etc/guix-daemon.conf.in?id=6158472d8ef2ae3d29a4d2ac662fda481f10a2eb'>guix-daemon.conf.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/guix-daemon.conf.in?id=6158472d8ef2ae3d29a4d2ac662fda481f10a2eb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-06-26 22:59:55 +0200'>2024-06-26</span></td><td><a href='/guix/commit/etc/guix-daemon.conf.in?id=d11b96eb5493231a5a35045505ff8ae8aa746b8e'>etc: Add explicit ‘--substitute-urls’ in guix-daemon service files.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-07 23:54:20 -0400'>2021-07-07</span></td><td><a href='/guix/commit/etc/guix-daemon.conf.in?id=4cbe0127a668cbcc64087c5d311308b59d39b104'>guix-install.sh: Prompt for configuring substitutes discovery.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>