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

Fix restricted mode when installing in non-canonical data dir

Browse source
This commit is contained in:
Shea Levy 2018-01-25 06:52:51 -08:00
parent 98f3c75a0e
commit ddbcd01c83
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -308,7 +308,7 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
for (auto & i : _searchPath) addToSearchPath(i); for (auto & i : _searchPath) addToSearchPath(i);
for (auto & i : paths) addToSearchPath(i); for (auto & i : paths) addToSearchPath(i);
} }
addToSearchPath("nix=" + settings.nixDataDir + "/nix/corepkgs"); addToSearchPath("nix=" + canonPath(settings.nixDataDir + "/nix/corepkgs"));
if (settings.restrictEval || settings.pureEval) { if (settings.restrictEval || settings.pureEval) {
allowedPaths = PathSet(); allowedPaths = PathSet();