public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

INFOPATH fix; the info.nix module should not set the INFOPATH variable in bashrc,

Browse Source 
because the bashrc already cares on that, even taking into account all the usual
nixos profiles.

As a side change, I changed a tab to spaces in bashrc.


svn path=/nixos/trunk/; revision=21439
This commit is contained in:
Lluís Batlle i Rossell 2010-04-29 18:59:05 +00:00
parent b47c2186f6
commit cf3f1e9f23
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/programs/bash/bashrc.sh
View File

@ -34,7 +34,7 @@ for i in $NIX_PROFILES; do # !!! reverse
# KDE/Gnome stuff. # KDE/Gnome stuff.
export KDEDIRS=$i:$KDEDIRS export KDEDIRS=$i:$KDEDIRS
export QT_PLUGIN_PATH=$i/plugins:$QT_PLUGIN_PATH export QT_PLUGIN_PATH=$i/plugins:$QT_PLUGIN_PATH
export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
done done

5
modules/programs/info.nix
View File

@ -33,9 +33,4 @@ in
{ {
environment.systemPackages = [infoWrapper]; environment.systemPackages = [infoWrapper];
environment.shellInit =
''
export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
'';
} }