civodul pushed a commit to branch master
in repository guix.
commit 50844e9737a8d967e5304810ae2746c4cdf15a2c
Author: Liam Hupfer <l...@hpfr.net>
AuthorDate: Wed Feb 5 22:25:02 2025 -0600
guix-install.sh: Add to MANPATH.
Guix and Guix-provided software also have man pages. If the user
doesn’t install man-db via Guix, they should still be able to read
Guix-provided man pages.
* etc/guix-install.sh (sys_create_init_profile): Add to MANPATH.
Change-Id: Ibceb354012d23d24deeb39b1ec02790873396a6b
Signed-off-by: Ludovic Courtès <l...@gnu.org>
---
etc/guix-install.sh | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 9a1d898b4b..ef338e89f7 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -652,10 +652,12 @@ export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
# `guix pull` profile
GUIX_PROFILE="$HOME/.config/guix/current"
export PATH="$GUIX_PROFILE/bin${PATH:+:}$PATH"
-# Add to INFOPATH so the latest Guix documentation is available to info
-# readers. When INFOPATH is unset, add a trailing colon so that Emacs searches
-# 'Info-default-directory-list'.
+# Add to INFOPATH and MANPATH so the latest Guix documentation is available to
+# info and man readers. When INFOPATH is unset, add a trailing colon so Emacs
+# searches 'Info-default-directory-list'. When MANPATH is unset, add a
+# trailing colon so the system default search path is used.
export INFOPATH="$GUIX_PROFILE/share/info:$INFOPATH"
+export MANPATH="$GUIX_PROFILE/share/man:$MANPATH"
# Expose the latest Guix modules to Guile so guix shell and repls spawned by
# e.g. Geiser work out of the box.
export
GUILE_LOAD_PATH="$GUIX_PROFILE/share/guile/site/3.0${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH"
@@ -669,14 +671,18 @@ if [ -L "$GUIX_PROFILE" ]; then
# see info '(guix) Application Setup'
export GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
- # INFOPATH may be handled by $GUIX_PROFILE/etc/profile if the user installs
- # an info reader via Guix. If the user doesn’t, explicitly add to INFOPATH
- # so documentation for software from ‘guix install’ is available to the
- # system info reader.
+ # Documentation search paths may be handled by $GUIX_PROFILE/etc/profile if
+ # the user installs info and man readers via Guix. If the user doesn’t,
+ # explicitly add to them so documentation for software from ‘guix install’
+ # is available to the system info and man readers.
case $INFOPATH in
*$GUIX_PROFILE/share/info*) ;;
*) export INFOPATH="$GUIX_PROFILE/share/info:$INFOPATH" ;;
esac
+ case $MANPATH in
+ *$GUIX_PROFILE/share/man*) ;;
+ *) export MANPATH="$GUIX_PROFILE/share/man:$MANPATH"
+ esac
fi
# NOTE: Guix Home handles its own profile initialization in ~/.profile. See
