lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

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

Browse source
This commit is contained in:
Eelco Dolstra 2021-10-06 18:08:18 +02:00
parent 57a8eb4c01 d90582be33
commit c497fce011
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libexpr/primops.cc
View file

@ -1891,6 +1891,20 @@ static void addPath(EvalState & state, const Pos & pos, const string & name, con
dstPath = state.store->printStorePath(*expectedStorePath); dstPath = state.store->printStorePath(*expectedStorePath);
mkString(v, dstPath, {dstPath}); 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;
}
} }