diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-07-23 16:56:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 16:56:58 +0200 |
| commit | a7b8f799380da911908cf20d95c9cd644e25ab10 (patch) | |
| tree | 8da743d14bd0101c1f660e7b493fc9a794303df8 /src/nix-env/nix-env.cc | |
| parent | 4bfba1305ed004c7b23b4e288efa707807cf2ac3 (diff) | |
| parent | 2274f63453dc0b5c76a50ae34d6f7c8ef329f411 (diff) | |
Merge pull request #3855 from obsidiansystems/delete-find-output
Get rid of `basicDerivation::findOutput`
Diffstat (limited to 'src/nix-env/nix-env.cc')
| -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 5795c2c09..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("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()); |