Merge branch 'flakes_filterSource' of https://github.com/tomberek/nix

NixOS · Oct 6, 2021 · c497fce · c497fce
2 parents 57a8eb4 + d90582b
commit c497fce
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
@@ -1891,6 +1891,20 @@ static void addPath(EvalState & state, const Pos & pos, const string & name, con
         dstPath = state.store->printStorePath(*expectedStorePath);
 
     mkString(v, dstPath, {dstPath});
+    if (state.allowedPaths)
+        state.allowedPaths->insert(v.string.s);
+
+    try {
+        state.realiseContext({});
+    } catch (InvalidPathError & e) {
+        throw EvalError({
+            .msg = hintfmt("cannot import '%1%', since path '%2%' is not valid", path, e.path),
+            .errPos = pos
+        });
+    } catch (Error & e) {
+        e.addTrace(pos, "while importing '%s'", path);
+        throw e;
+    }
 }