maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Put building in the store API.

Browse source
This commit is contained in:
Eelco Dolstra 2006-11-30 18:02:04 +00:00
parent e2ef5e07fd
commit 6ecb840fd1
11 changed files with 31 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/nix-store/main.cc
View file

@ -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();