aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-01-25 06:52:51 -0800
committerShea Levy <shea@shealevy.com>2018-02-22 07:18:14 -0500
commitddbcd01c835419cc40f648670f28646a8f51bd15 (patch)
tree624a7d8a6ef9d913963eca35573ac774e67597bf
parent98f3c75a0e16f5aaaecb25a46f988580efb04d19 (diff)
Fix restricted mode when installing in non-canonical data dir
-rw-r--r--src/libexpr/eval.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 33a9bc614..60f22a203 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -308,7 +308,7 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
for (auto & i : _searchPath) 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) {
allowedPaths = PathSet();