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

libexpr: treat derivation like a normal primop for baseEnv construction

Browse source 
that way we don't need to eval while initializing the evaluator. this
will make a lot more sense once we start pushing asyncio through here

Change-Id: I3663052438ed97d48e213b71395ad1dd5e1318bb
This commit is contained in:
eldritch horrors 2024-11-27 02:09:08 +01:00
parent e9520ffd06
commit 12802b492a
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lix/libexpr/primops.cc
View file

@ -2830,13 +2830,28 @@ void EvalState::createBaseEnv()
addPrimOp(std::move(primOpAdjusted));
}
static PrimOp prim_initializeDerivation{
.arity = 1,
.fun =
[](EvalState & state, PosIdx pos, Value ** args, Value & v) {
char code[] =
#include "primops/derivation.nix.gen.hh"
;
auto & expr = *state.parse(
code, sizeof(code), Pos::Hidden{}, {CanonPath::root}, state.staticBaseEnv
);
state.eval(expr, v);
},
};
static Value initializeDerivation{NewValueAs::primop, prim_initializeDerivation};
/* Add a wrapper around the derivation primop that computes the
`drvPath' and `outPath' attributes lazily.
Null docs because it is documented separately.
App instead of PrimopApp to have eval immediately force it when accessed.
*/
auto vDerivation = mem.allocValue();
addConstant("derivation", vDerivation, {
addConstant("derivation", {NewValueAs::app, initializeDerivation, initializeDerivation}, {
.type = nFunction,
});
@ -2847,12 +2862,6 @@ void EvalState::createBaseEnv()
staticBaseEnv->sort();
staticBaseEnv->isRoot = true;
/* Note: we have to initialize the 'derivation' constant *after*
building baseEnv/staticBaseEnv because it uses 'builtins'. */
char code[] =
#include "primops/derivation.nix.gen.hh"
;
eval(*parse(code, sizeof(code), Pos::Hidden{}, {CanonPath::root}, staticBaseEnv), *vDerivation);
}