nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

toBuildables -> build

Browse source
This commit is contained in:
Eelco Dolstra 2018-02-09 16:42:32 +01:00
parent 960e9c560e
commit 35fd31770c
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/build.cc
View file

@ -50,7 +50,7 @@ struct CmdBuild : MixDryRun, InstallablesCommand
void run(ref<Store> store) override void run(ref<Store> store) override
{ {
auto buildables = toBuildables(store, dryRun ? DryRun : Build, installables); auto buildables = build(store, dryRun ? DryRun : Build, installables);
for (size_t i = 0; i < buildables.size(); ++i) { for (size_t i = 0; i < buildables.size(); ++i) {
auto & b(buildables[i]); auto & b(buildables[i]);

2
src/nix/command.hh
View file

@ -198,7 +198,7 @@ std::shared_ptr<Installable> parseInstallable(
SourceExprCommand & cmd, ref<Store> store, const std::string & installable, SourceExprCommand & cmd, ref<Store> store, const std::string & installable,
bool useDefaultInstallables); bool useDefaultInstallables);
Buildables toBuildables(ref<Store> store, RealiseMode mode, Buildables build(ref<Store> store, RealiseMode mode,
std::vector<std::shared_ptr<Installable>> installables); std::vector<std::shared_ptr<Installable>> installables);
PathSet toStorePaths(ref<Store> store, RealiseMode mode, PathSet toStorePaths(ref<Store> store, RealiseMode mode,

4
src/nix/installables.cc
View file

@ -253,7 +253,7 @@ std::shared_ptr<Installable> parseInstallable(
return installables.front(); return installables.front();
} }
Buildables toBuildables(ref<Store> store, RealiseMode mode, Buildables build(ref<Store> store, RealiseMode mode,
std::vector<std::shared_ptr<Installable>> installables) std::vector<std::shared_ptr<Installable>> installables)
{ {
if (mode != Build) if (mode != Build)
@ -291,7 +291,7 @@ PathSet toStorePaths(ref<Store> store, RealiseMode mode,
{ {
PathSet outPaths; PathSet outPaths;
for (auto & b : toBuildables(store, mode, installables)) for (auto & b : build(store, mode, installables))
for (auto & output : b.outputs) for (auto & output : b.outputs)
outPaths.insert(output.second); outPaths.insert(output.second);