diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-04-25T14·19+0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-04-25T14·19+0200 |
commit | c30330df6f67c81986dfb124631bc756c8e58c0d (patch) | |
tree | ae398eedf65b06cba340292893afce6a041e7299 /src/nix/run.cc | |
parent | d48c973ece20875391bebde3c167d6e0cc1e666e (diff) |
StorePathCommands: Build installables
So for instance "nix copy --to ... nixpkgs.hello" will build nixpkgs.hello first. It's debatable whether this is a good idea. It seems desirable for commands like "nix copy" but maybe not for commands like "nix path-info".
Diffstat (limited to 'src/nix/run.cc')
-rw-r--r-- | src/nix/run.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/nix/run.cc b/src/nix/run.cc index a0ce56134b07..bcfa74eb5f5f 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -30,7 +30,7 @@ struct CmdRun : InstallablesCommand void run(ref<Store> store) override { - auto paths = buildInstallables(store, false); + auto outPaths = buildInstallables(store, false); auto store2 = store.dynamic_pointer_cast<LocalStore>(); @@ -89,14 +89,6 @@ struct CmdRun : InstallablesCommand #endif } - PathSet outPaths; - for (auto & path : paths) - if (isDerivation(path)) { - Derivation drv = store->derivationFromPath(path); - for (auto & output : drv.outputs) - outPaths.insert(output.second.path); - } else - outPaths.insert(path); auto unixPath = tokenizeString<Strings>(getEnv("PATH"), ":"); for (auto & path : outPaths) |