diff options
Diffstat (limited to 'src/nix-env')
| -rw-r--r-- | src/nix-env/Makefile.am | 2 | ||||
| -rw-r--r-- | src/nix-env/main.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am index 53d8d9b02256..bfe7369c6986 100644 --- a/src/nix-env/Makefile.am +++ b/src/nix-env/Makefile.am @@ -4,7 +4,7 @@ nix_env_SOURCES = main.cc help.txt nix_env_LDADD = ../libmain/libmain.a ../libexpr/libexpr.a \ ../libstore/libstore.a ../libutil/libutil.a \ ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx \ - -lsglr -lATB -lconversion -lasfix2 -lmept -lATerm + -lATerm main.o: help.txt.hh 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; |