about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-02-22T13·20+0100
committerEelco Dolstra <edolstra@gmail.com>2018-02-22T13·20+0100
commit179b896acb6deb8fea9614dfbddeaf3b23797bf5 (patch)
treecc3af97406d2bafb1cceaa3fbbeab65b485cbfd3
parente8d53bfdc94eea142542de92ff0822eb283d293f (diff)
parentddbcd01c835419cc40f648670f28646a8f51bd15 (diff)
Merge branch 'data-dir-non-canon' of https://github.com/shlevy/nix
-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 2144d3452579..63afccbec188 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -313,7 +313,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();