lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Provide a default value for NIX_PATH

Browse source
This commit is contained in:
Eelco Dolstra 2019-11-22 22:08:51 +01:00
parent 1c3ccba0f5
commit ec9dd9a5ae
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/nix-profile-daemon.sh.in
View file

@ -24,5 +24,4 @@ else
done done
fi 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" export PATH="$HOME/.nix-profile/bin:@localstatedir@/nix/profiles/default/bin:$PATH"

5
scripts/nix-profile.sh.in
View file

@ -5,11 +5,6 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
NIX_LINK=$HOME/.nix-profile 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. # Set up environment.
# This part should be kept in sync with nixpkgs:nixos/modules/programs/environment.nix # This part should be kept in sync with nixpkgs:nixos/modules/programs/environment.nix
export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile" export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile"

14
src/libexpr/eval.cc
View file

@ -275,6 +275,17 @@ static Strings parseNixPath(const string & s)
} }
static Strings getDefaultNixPath()
{
Strings res;
auto add = [&](const Path & p) { if (pathExists(p)) { res.push_back(p); } };
add(getHome() + "/.nix-defexpr/channels");
add("nixpkgs=" + settings.nixStateDir + "/nix/profiles/per-user/root/channels/nixpkgs");
add(settings.nixStateDir + "/nix/profiles/per-user/root/channels");
return res;
}
EvalState::EvalState(const Strings & _searchPath, ref<Store> store) EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
: sWith(symbols.create("<with>")) : sWith(symbols.create("<with>"))
, sOutPath(symbols.create("outPath")) , sOutPath(symbols.create("outPath"))
@ -314,7 +325,8 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
/* Initialise the Nix expression search path. */ /* Initialise the Nix expression search path. */
if (!evalSettings.pureEval) { if (!evalSettings.pureEval) {
Strings paths = parseNixPath(getEnv("NIX_PATH").value_or("")); auto nixPath = getEnv("NIX_PATH");
auto paths = nixPath ? parseNixPath(*nixPath) : getDefaultNixPath();
for (auto & i : _searchPath) addToSearchPath(i); for (auto & i : _searchPath) addToSearchPath(i);
for (auto & i : paths) addToSearchPath(i); for (auto & i : paths) addToSearchPath(i);
} }