diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-11-22 22:08:51 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-11-22 22:08:51 +0100 |
| commit | ec9dd9a5aeb9b7fca170d86b8906ffac7e5ef057 (patch) | |
| tree | cb9c9ca06d448b7a2f42472a7c1fd7f0c397ff03 /scripts | |
| parent | 1c3ccba0f5e658fa5d593ddef8aaaf6728f945a5 (diff) | |
Provide a default value for NIX_PATH
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/nix-profile-daemon.sh.in | 1 | ||||
| -rw-r--r-- | scripts/nix-profile.sh.in | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/scripts/nix-profile-daemon.sh.in b/scripts/nix-profile-daemon.sh.in index e0c24954a..4bc7c6fc5 100644 --- a/scripts/nix-profile-daemon.sh.in +++ b/scripts/nix-profile-daemon.sh.in @@ -24,5 +24,4 @@ else done fi -export NIX_PATH="nixpkgs=@localstatedir@/nix/profiles/per-user/root/channels/nixpkgs:@localstatedir@/nix/profiles/per-user/root/channels" export PATH="$HOME/.nix-profile/bin:@localstatedir@/nix/profiles/default/bin:$PATH" diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in index 0768c805a..8cba1c522 100644 --- a/scripts/nix-profile.sh.in +++ b/scripts/nix-profile.sh.in @@ -5,11 +5,6 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then NIX_LINK=$HOME/.nix-profile - - # Append ~/.nix-defexpr/channels to $NIX_PATH so that <nixpkgs> - # paths work when the user has fetched the Nixpkgs channel. - export NIX_PATH=${NIX_PATH:+$NIX_PATH:}$HOME/.nix-defexpr/channels - # Set up environment. # This part should be kept in sync with nixpkgs:nixos/modules/programs/environment.nix export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile" |