diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index 9923b0dc1..62b88f42f 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -359,9 +359,8 @@ Goal::Done DerivationGoal::done(BuildResult::Status status, SingleDrvOutputs bui mcExpectedBuilds.reset(); if (buildResult.success()) { - auto wantedBuiltOutputs = filterDrvOutputs(OutputsSpec::Names{wantedOutput}, std::move(builtOutputs)); - assert(!wantedBuiltOutputs.empty()); - buildResult.builtOutputs = std::move(wantedBuiltOutputs); + assert(!builtOutputs.empty()); + buildResult.builtOutputs = std::move(builtOutputs); if (status == BuildResult::Built) worker.doneBuilds++; } else { diff --git a/src/libstore/include/nix/store/realisation.hh b/src/libstore/include/nix/store/realisation.hh index f653d517b..6eb3eecf3 100644 --- a/src/libstore/include/nix/store/realisation.hh +++ b/src/libstore/include/nix/store/realisation.hh @@ -102,13 +102,6 @@ typedef std::map SingleDrvOutputs; */ typedef std::map DrvOutputs; -/** - * Filter a SingleDrvOutputs to include only specific output names - * - * Moves the `outputs` input. - */ -SingleDrvOutputs filterDrvOutputs(const OutputsSpec &, SingleDrvOutputs &&); - struct OpaquePath { StorePath path; diff --git a/src/libstore/realisation.cc b/src/libstore/realisation.cc index 8a6d99ffe..8c3baa73b 100644 --- a/src/libstore/realisation.cc +++ b/src/libstore/realisation.cc @@ -135,18 +135,6 @@ size_t Realisation::checkSignatures(const PublicKeys & publicKeys) const return good; } -SingleDrvOutputs filterDrvOutputs(const OutputsSpec & wanted, SingleDrvOutputs && outputs) -{ - SingleDrvOutputs ret = std::move(outputs); - for (auto it = ret.begin(); it != ret.end();) { - if (!wanted.contains(it->first)) - it = ret.erase(it); - else - ++it; - } - return ret; -} - StorePath RealisedPath::path() const { return std::visit([](auto && arg) { return arg.getPath(); }, raw);