From fec916552c934314ba19ab9d09522d206a215d40 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Jan 2008 11:46:17 +0000 Subject: [PATCH] * Add $prefix/info, set $INFOPATH. svn path=/nixos/trunk/; revision=10087 --- etc/profile.sh | 2 ++ system/options.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/profile.sh b/etc/profile.sh index 832ea5cccb0..aa164b2de9b 100644 --- a/etc/profile.sh +++ b/etc/profile.sh @@ -7,6 +7,7 @@ export TZDIR=@glibc@/share/zoneinfo export FONTCONFIG_FILE=/etc/fonts/fonts.conf export LANG=@defaultLocale@ export EDITOR=nano +export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info # A nice prompt. @@ -52,6 +53,7 @@ NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile" for i in $NIX_PROFILES; do # !!! reverse export PATH=$i/bin:$i/sbin:$PATH + export INFOPATH=$i/info:$i/share/info:$INFOPATH export ASPELL_EXTRA_DICT_DIRS="$i/lib/aspell${ASPELL_EXTRA_DICT_DIRS:+,}$ASPELL_EXTRA_DICT_DIRS" done diff --git a/system/options.nix b/system/options.nix index 3ed50ce34ff..f002168ab8e 100644 --- a/system/options.nix +++ b/system/options.nix @@ -1815,7 +1815,7 @@ root ALL=(ALL) SETENV: ALL environment = { pathsToLink = mkOption { - default = ["/bin" "/sbin" "/share" "/man"]; + default = ["/bin" "/sbin" "/share" "/man" "/info"]; example = ["/"]; description = " This allows to symlink more directories in /var/run/current-system/sw