From cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Thu, 29 Apr 2010 18:59:05 +0000
Subject: 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
---
 modules/programs/bash/bashrc.sh | 2 +-
 modules/programs/info.nix       | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'modules/programs')

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  
-    '';
 }
-- 
cgit 1.4.1