wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 20:01:15 +02:00
Code 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
Download patch file Download diff file Expand all files Collapse all files

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)
: sWith(symbols.create("<with>"))
, sOutPath(symbols.create("outPath"))
@ -314,7 +325,8 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
/* Initialise the Nix expression search path. */
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 : paths) addToSearchPath(i);
}