diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-11-30 18:02:04 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-11-30 18:02:04 +0000 |
| commit | 6ecb840fd118019f879de60007e13321b7c080d3 (patch) | |
| tree | 29f9db5fbf0da0b3e08af282db1a0fedba81decf /src/nix-env | |
| parent | e2ef5e07fdc142670f7f3161d3133ff04e99d342 (diff) | |
* Put building in the store API.
Diffstat (limited to 'src/nix-env')
| -rw-r--r-- | src/nix-env/main.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc index 997c45da3..ce0bef069 100644 --- a/src/nix-env/main.cc +++ b/src/nix-env/main.cc @@ -1,7 +1,6 @@ #include "profiles.hh" #include "names.hh" #include "globals.hh" -#include "build.hh" #include "misc.hh" #include "gc.hh" #include "shared.hh" @@ -152,7 +151,7 @@ static void createUserEnv(EvalState & state, const DrvInfos & elems, drvsToBuild.insert(i->queryDrvPath(state)); debug(format("building user environment dependencies")); - buildDerivations(drvsToBuild); + store->buildDerivations(drvsToBuild); /* Get the environment builder expression. */ Expr envBuilder = parseExprFromFile(state, @@ -184,7 +183,7 @@ static void createUserEnv(EvalState & state, const DrvInfos & elems, /* This is only necessary when installing store paths, e.g., `nix-env -i /nix/store/abcd...-foo'. */ addTempRoot(i->queryOutPath(state)); - ensurePath(i->queryOutPath(state)); + store->ensurePath(i->queryOutPath(state)); references.insert(i->queryOutPath(state)); if (drvPath != "") references.insert(drvPath); @@ -212,7 +211,7 @@ static void createUserEnv(EvalState & state, const DrvInfos & elems, /* Realise the resulting store expression. */ debug(format("building user environment")); - buildDerivations(singleton<PathSet>(topLevelDrv.queryDrvPath(state))); + store->buildDerivations(singleton<PathSet>(topLevelDrv.queryDrvPath(state))); /* Switch the current user environment to the output path. */ debug(format("switching to new user environment")); |