From ddbcd01c835419cc40f648670f28646a8f51bd15 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 25 Jan 2018 06:52:51 -0800
Subject: [PATCH] Fix restricted mode when installing in non-canonical data dir
---
src/libexpr/eval.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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();
--
GitLab