diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-22 14:20:43 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-22 14:20:43 +0100 |
| commit | 179b896acb6deb8fea9614dfbddeaf3b23797bf5 (patch) | |
| tree | cc3af97406d2bafb1cceaa3fbbeab65b485cbfd3 /src/libexpr | |
| parent | e8d53bfdc94eea142542de92ff0822eb283d293f (diff) | |
| parent | ddbcd01c835419cc40f648670f28646a8f51bd15 (diff) | |
Merge branch 'data-dir-non-canon' of https://github.com/shlevy/nix
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/eval.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 2144d3452..63afccbec 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(); |