aboutsummaryrefslogtreecommitdiff
path: root/src/nix/installables.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-07-14 14:23:38 +0200
committerEelco Dolstra <edolstra@gmail.com>2017-07-14 18:29:07 +0200
commit6438ba22af57edc054e441053a7c3cd5d48e5597 (patch)
treec4d3f81b34d2031b0e03ab4c5fe0053123097b78 /src/nix/installables.cc
parent15e8bd3bcb9b458ad3bc6188bdf531ecb6d65c4a (diff)
StorePathsCommand: Don't build installables
On second though this was annoying. E.g. "nix log nixpkgs.hello" would build/download Hello first, even though the log can be fetched directly from the binary cache. May need to revisit this.
Diffstat (limited to 'src/nix/installables.cc')
-rw-r--r--src/nix/installables.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index 9982ff75f..f0d5d547c 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -214,7 +214,7 @@ std::vector<std::shared_ptr<Installable>> InstallablesCommand::parseInstallables
return result;
}
-PathSet InstallablesCommand::buildInstallables(ref<Store> store, bool dryRun)
+PathSet InstallablesCommand::toStorePaths(ref<Store> store, ToStorePathsMode mode)
{
PathSet buildables;
@@ -223,9 +223,9 @@ PathSet InstallablesCommand::buildInstallables(ref<Store> store, bool dryRun)
buildables.insert(b.begin(), b.end());
}
- if (dryRun)
+ if (mode == DryRun)
printMissing(store, buildables);
- else
+ else if (mode == Build)
store->buildPaths(buildables);
PathSet outPaths;