diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-27 16:17:50 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-27 16:17:50 +0000 |
| commit | 1d7d94ceea0dbed564a5c3812f00be7fdaf1aa52 (patch) | |
| tree | 6d197c708e6006965f16cd219b2012d403eaf584 /src/nix/installables.cc | |
| parent | 66a2067288a86dae19aecfa9e6a5b2d37952669f (diff) | |
| parent | 43f2bd8dc5950c38a817242884870f344a84a291 (diff) | |
Merge branch 'hash-always-has-type' of github.com:obsidiansystems/nix into better-ca-parse-errors
Diffstat (limited to 'src/nix/installables.cc')
| -rw-r--r-- | src/nix/installables.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nix/installables.cc b/src/nix/installables.cc index 5c963d044..a17477c8a 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -304,8 +304,9 @@ struct InstallableStorePath : Installable { if (storePath.isDerivation()) { std::map<std::string, StorePath> outputs; - for (auto & [name, output] : store->readDerivation(storePath).outputs) - outputs.emplace(name, output.path); + auto drv = store->readDerivation(storePath); + for (auto & [name, output] : drv.outputs) + outputs.emplace(name, output.path(*store, drv.name)); return { Buildable { .drvPath = storePath, |