mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-11 00:36:20 +02:00
Fix scopedImport
This commit is contained in:
parent
5916daf1fe
commit
e827e6288f
1 changed files with 3 additions and 4 deletions
|
@ -165,8 +165,6 @@ static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vS
|
|||
{
|
||||
auto path = realisePath(state, pos, vPath);
|
||||
|
||||
state.evalFile(path, v);
|
||||
|
||||
#if 0
|
||||
// FIXME
|
||||
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);
|
||||
}
|
||||
|
||||
else {
|
||||
else
|
||||
#endif
|
||||
{
|
||||
if (!vScope)
|
||||
state.evalFile(path, v);
|
||||
else {
|
||||
|
@ -233,7 +233,6 @@ static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vS
|
|||
e->eval(state, *env, v);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static RegisterPrimOp primop_scopedImport(RegisterPrimOp::Info {
|
||||
|
|
Loading…
Reference in a new issue