diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-29 18:59:05 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-29 18:59:05 +0000 |
| commit | cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e (patch) | |
| tree | 23c387f4acd6ac4f4a241831479a921e51ff7955 /modules/programs | |
| parent | b47c2186f61389b027bd5cfd5fd6b4e59d2037ec (diff) | |
| download | nixpkgs-cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e.tar nixpkgs-cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e.tar.gz nixpkgs-cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e.tar.bz2 nixpkgs-cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e.tar.lz nixpkgs-cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e.tar.xz nixpkgs-cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e.tar.zst nixpkgs-cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e.zip | |
INFOPATH fix; the info.nix module should not set the INFOPATH variable in bashrc,
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
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/bash/bashrc.sh | 2 | ||||
| -rw-r--r-- | modules/programs/info.nix | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh index cffd817663a..9c2ff17c6cb 100644 --- a/modules/programs/bash/bashrc.sh +++ b/modules/programs/bash/bashrc.sh @@ -34,7 +34,7 @@ for i in $NIX_PROFILES; do # !!! reverse # KDE/Gnome stuff. 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_DATA_DIRS=$i/share:$XDG_DATA_DIRS done diff --git a/modules/programs/info.nix b/modules/programs/info.nix index a12aef6a7d0..e3b8025f933 100644 --- a/modules/programs/info.nix +++ b/modules/programs/info.nix @@ -33,9 +33,4 @@ in { environment.systemPackages = [infoWrapper]; - - environment.shellInit = - '' - export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info - ''; } |