about summary refs log tree commit diff
path: root/src/nix-env/main.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-02-04T16·03+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-02-04T16·03+0000
commit9b44480612dd30a7292ec94a88e4018b8f18e3f0 (patch)
tree0c83114806a4f7724a5dd8dcb0694103e70acb71 /src/nix-env/main.cc
parentc4f7ae4aa5fc7071cfa853ec5d75aaf00e7a97fc (diff)
* Use a map to lookup primops.
* Various performance improvements in the evaluator.
* Do not link against unused (and missing!) libraries (-lsglr, etc.).

Diffstat (limited to 'src/nix-env/main.cc')
-rw-r--r--src/nix-env/main.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc
index 0fd4ec63ae07..3810e9144236 100644
--- a/src/nix-env/main.cc
+++ b/src/nix-env/main.cc
@@ -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;