Author: viric Date: Sun Sep 19 00:21:30 2010 New Revision: 23861 URL: https://svn.nixos.org/websvn/nix/?rev=23861&sc=1
Log: Applying patch sent by roconnor about allowing "nix-env -S" in NixOS. I agree with the change. Modified: nixos/trunk/modules/programs/bash/bashrc.sh Modified: nixos/trunk/modules/programs/bash/bashrc.sh ============================================================================== --- nixos/trunk/modules/programs/bash/bashrc.sh Sat Sep 18 16:36:03 2010 (r23860) +++ nixos/trunk/modules/programs/bash/bashrc.sh Sun Sep 19 00:21:30 2010 (r23861) @@ -15,7 +15,7 @@ # Include the various profiles in the appropriate environment variables. NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER -NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile" +NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile" unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB GST_PLUGIN_PATH KDEDIRS unset XDG_CONFIG_DIRS XDG_DATA_DIRS @@ -43,7 +43,7 @@ # Search directory for Aspell dictionaries. -export ASPELL_CONF="dict-dir $NIX_USER_PROFILE_DIR/profile/lib/aspell" +export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell" # ~/bin and the setuid wrappers override other bin directories. _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
