diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-09T15·42+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-12T16·06+0100 |
| commit | 35fd31770c589f28c569e7868f868a5b558cf83d (patch) | |
| tree | 5e70dff7cac1ed2744295cbca59fb6fb00ff382f | |
| parent | 960e9c560e335c65d378805fdb2594e7079a0c45 (diff) | |
toBuildables -> build
| -rw-r--r-- | src/nix/build.cc | 2 | ||||
| -rw-r--r-- | src/nix/command.hh | 2 | ||||
| -rw-r--r-- | src/nix/installables.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/nix/build.cc b/src/nix/build.cc index f7c99f12dbbf..b4f21b32d78f 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -50,7 +50,7 @@ struct CmdBuild : MixDryRun, InstallablesCommand 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) { auto & b(buildables[i]); diff --git a/src/nix/command.hh b/src/nix/command.hh index a7863c49f37a..97a6fee7fd27 100644 --- a/src/nix/command.hh +++ b/src/nix/command.hh @@ -198,7 +198,7 @@ std::shared_ptr<Installable> parseInstallable( SourceExprCommand & cmd, ref<Store> store, const std::string & installable, bool useDefaultInstallables); -Buildables toBuildables(ref<Store> store, RealiseMode mode, +Buildables build(ref<Store> store, RealiseMode mode, std::vector<std::shared_ptr<Installable>> installables); PathSet toStorePaths(ref<Store> store, RealiseMode mode, diff --git a/src/nix/installables.cc b/src/nix/installables.cc index c3b06c22eba8..a3fdd8a2808d 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -253,7 +253,7 @@ std::shared_ptr<Installable> parseInstallable( return installables.front(); } -Buildables toBuildables(ref<Store> store, RealiseMode mode, +Buildables build(ref<Store> store, RealiseMode mode, std::vector<std::shared_ptr<Installable>> installables) { if (mode != Build) @@ -291,7 +291,7 @@ PathSet toStorePaths(ref<Store> store, RealiseMode mode, { PathSet outPaths; - for (auto & b : toBuildables(store, mode, installables)) + for (auto & b : build(store, mode, installables)) for (auto & output : b.outputs) outPaths.insert(output.second); |