max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-13 09:46:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix scopedImport

Browse source
This commit is contained in:
Eelco Dolstra 2022-02-07 13:27:59 +01:00
parent 5916daf1fe
commit e827e6288f
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/primops.cc
View file

@ -165,8 +165,6 @@ static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vS
{ {
auto path = realisePath(state, pos, vPath); auto path = realisePath(state, pos, vPath);
state.evalFile(path, v);
#if 0 #if 0
// FIXME // FIXME
auto isValidDerivationInStore = [&]() -> std::optional<StorePath> { auto isValidDerivationInStore = [&]() -> std::optional<StorePath> {
@ -207,7 +205,9 @@ static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vS
state.forceAttrs(v, pos); state.forceAttrs(v, pos);
} }
else { else
#endif
{
if (!vScope) if (!vScope)
state.evalFile(path, v); state.evalFile(path, v);
else { else {
@ -233,7 +233,6 @@ static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vS
e->eval(state, *env, v); e->eval(state, *env, v);
} }
} }
#endif
} }
static RegisterPrimOp primop_scopedImport(RegisterPrimOp::Info { static RegisterPrimOp primop_scopedImport(RegisterPrimOp::Info {