diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-23 19:17:52 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-23 19:17:52 +0000 |
| commit | 58e55c0923833512853a9c08ca556936faeb21dc (patch) | |
| tree | 4c2fc3599534046dd64816ebec8f9bf0e970fb23 /src/nix-env | |
| parent | c36916eca0edbbbbaf928405b7e2cc89840eac49 (diff) | |
| parent | a2af25c55a9d8a0bc7333b5e3e3597353a2bd65a (diff) | |
Merge branch 'misc-ca' of github.com:obsidiansystems/nix into derivation-primop-floating-output
Diffstat (limited to 'src/nix-env')
| -rw-r--r-- | src/nix-env/nix-env.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index 1a36dbee3..ddd036070 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -381,7 +381,8 @@ static void queryInstSources(EvalState & state, if (path.isDerivation()) { elem.setDrvPath(state.store->printStorePath(path)); - elem.setOutPath(state.store->printStorePath(state.store->derivationFromPath(path).findOutput(*state.store, "out"))); + auto outputs = state.store->queryDerivationOutputMap(path); + elem.setOutPath(state.store->printStorePath(outputs.at("out"))); if (name.size() >= drvExtension.size() && string(name, name.size() - drvExtension.size()) == drvExtension) name = string(name, 0, name.size() - drvExtension.size()); |