diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-14 17:00:13 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-14 17:00:13 +0000 |
| commit | 3c8b5b62192b828c392e9122536d666e23278d8e (patch) | |
| tree | 6302c4599c947dee9044e74f5f116aa927713c8f /src/nix/installables.cc | |
| parent | 5f80aea795d3f6f78d682c7b99453b6fb7c9b6ba (diff) | |
| parent | 13e49be6602314fe5e5d7beb8a807d5d892e864e (diff) | |
Merge remote-tracking branch 'upstream/master' into single-ca-drv-build
Diffstat (limited to 'src/nix/installables.cc')
| -rw-r--r-- | src/nix/installables.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/installables.cc b/src/nix/installables.cc index 2ff94cd38..c3c3b9a12 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -304,8 +304,8 @@ struct InstallableStorePath : Installable if (storePath.isDerivation()) { std::map<std::string, std::optional<StorePath>> outputs; auto drv = store->readDerivation(storePath); - for (auto & [name, output] : drv.outputs) - outputs.emplace(name, output.pathOpt(*store, drv.name)); + for (auto & [name, output] : drv.outputsAndOptPaths(*store)) + outputs.emplace(name, output.second); return { BuildableFromDrv { .drvPath = storePath, |