diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-09-19 00:21:30 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-09-19 00:21:30 +0000 |
| commit | b9aa56969fbf2af1aebbf13b03f21937a86d12ec (patch) | |
| tree | e834a83b0edcf16a00a56615360507ec1b8493f7 /modules/programs | |
| parent | 385ec8981797329edc5b989b98e82dc43e7d1a2e (diff) | |
| download | nixpkgs-b9aa56969fbf2af1aebbf13b03f21937a86d12ec.tar nixpkgs-b9aa56969fbf2af1aebbf13b03f21937a86d12ec.tar.gz nixpkgs-b9aa56969fbf2af1aebbf13b03f21937a86d12ec.tar.bz2 nixpkgs-b9aa56969fbf2af1aebbf13b03f21937a86d12ec.tar.lz nixpkgs-b9aa56969fbf2af1aebbf13b03f21937a86d12ec.tar.xz nixpkgs-b9aa56969fbf2af1aebbf13b03f21937a86d12ec.tar.zst nixpkgs-b9aa56969fbf2af1aebbf13b03f21937a86d12ec.zip | |
Applying patch sent by roconnor about allowing "nix-env -S" in NixOS. I agree with the change.
svn path=/nixos/trunk/; revision=23861
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/bash/bashrc.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh index e43b716a0ce..6fe59e92b95 100644 --- a/modules/programs/bash/bashrc.sh +++ b/modules/programs/bash/bashrc.sh @@ -15,7 +15,7 @@ export LOCATE_PATH=/var/cache/locatedb # 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 @@ done # 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. |