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-store | |
| parent | e2ef5e07fdc142670f7f3161d3133ff04e99d342 (diff) | |
* Put building in the store API.
Diffstat (limited to 'src/nix-store')
| -rw-r--r-- | src/nix-store/main.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc index 273fa3e74..f31814881 100644 --- a/src/nix-store/main.cc +++ b/src/nix-store/main.cc @@ -2,7 +2,6 @@ #include <algorithm> #include "globals.hh" -#include "build.hh" #include "misc.hh" #include "gc.hh" #include "archive.hh" @@ -64,7 +63,7 @@ static Path realisePath(const Path & path) if (isDerivation(path)) { PathSet paths; paths.insert(path); - buildDerivations(paths); + store->buildDerivations(paths); Path outPath = findOutput(derivationFromPath(path), "out"); if (gcRoot == "") @@ -76,7 +75,7 @@ static Path realisePath(const Path & path) return outPath; } else { - ensurePath(path); + store->ensurePath(path); return path; } } @@ -97,7 +96,7 @@ static void opRealise(Strings opFlags, Strings opArgs) i != opArgs.end(); ++i) if (isDerivation(*i)) drvPaths.insert(*i); - buildDerivations(drvPaths); + store->buildDerivations(drvPaths); } for (Strings::iterator i = opArgs.begin(); |