mirror of
https://github.com/NixOS/nix
synced 2025-06-28 01:11:15 +02:00
* Use a map to lookup primops.
* Various performance improvements in the evaluator. * Do not link against unused (and missing!) libraries (-lsglr, etc.).
This commit is contained in:
parent
c4f7ae4aa5
commit
9b44480612
12 changed files with 127 additions and 75 deletions
|
@ -102,7 +102,7 @@ bool parseDerivations(EvalState & state, Expr e, DrvInfos & drvs)
|
|||
|
||||
void loadDerivations(EvalState & state, Path nePath, DrvInfos & drvs)
|
||||
{
|
||||
Expr e = parseExprFromFile(absPath(nePath));
|
||||
Expr e = parseExprFromFile(state, absPath(nePath));
|
||||
if (!parseDerivations(state, e, drvs))
|
||||
throw badTerm("expected set of derivations", e);
|
||||
}
|
||||
|
@ -193,7 +193,8 @@ void createUserEnv(EvalState & state, const DrvInfos & drvs,
|
|||
const Path & linkPath)
|
||||
{
|
||||
/* Get the environment builder expression. */
|
||||
Expr envBuilder = parseExprFromFile(nixDataDir + "/nix/corepkgs/buildenv"); /* !!! */
|
||||
Expr envBuilder = parseExprFromFile(state,
|
||||
nixDataDir + "/nix/corepkgs/buildenv"); /* !!! */
|
||||
|
||||
/* Construct the whole top level derivation. */
|
||||
ATermList inputs = ATempty;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue