From 6ecb840fd118019f879de60007e13321b7c080d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 30 Nov 2006 18:02:04 +0000 Subject: * Put building in the store API. --- src/nix-store/main.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/nix-store/main.cc') diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc index 273fa3e7457e..f31814881f71 100644 --- a/src/nix-store/main.cc +++ b/src/nix-store/main.cc @@ -2,7 +2,6 @@ #include #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(); -- cgit 1.4.1