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

Restructure installables handling in the "nix" command

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-25 11:20:37 +02:00
parent 1bb87c0487
commit bcecc99007
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
9 changed files with 265 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/nix/build.cc
View file

@ -6,7 +6,7 @@
using namespace nix;
struct CmdBuild : StoreCommand, MixDryRun, MixInstallables
struct CmdBuild : MixDryRun, MixInstallables
{
CmdBuild()
{
@ -24,22 +24,9 @@ struct CmdBuild : StoreCommand, MixDryRun, MixInstallables
void run(ref<Store> store) override
{
auto elems = evalInstallables(store);
auto paths = buildInstallables(store, dryRun);
PathSet pathsToBuild;
for (auto & elem : elems) {
if (elem.isDrv)
pathsToBuild.insert(elem.drvPath);
else
pathsToBuild.insert(elem.outPaths.begin(), elem.outPaths.end());
}
printMissing(store, pathsToBuild);
if (dryRun) return;
store->buildPaths(pathsToBuild);
printInfo("build result: %s", showPaths(paths));
}
};