Skip to content

Commit

Permalink
Revert "TEMP no need to change this callsite"
Browse files Browse the repository at this point in the history
This reverts commit dbf384faea2371044991b19bee8ed2e95e0e377a.
  • Loading branch information
Ericson2314 committed Aug 16, 2023
1 parent a643701 commit eaaf7cc
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/libcmd/installables.cc
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,14 @@ StorePathSet Installable::toDerivations(
: throw Error("argument '%s' did not evaluate to a derivation", i->what()));
},
[&](const DerivedPath::Built & bfd) {
drvPaths.insert(resolveDerivedPath(*store, *bfd.drvPath));
drvPaths.insert(std::visit(overloaded {
[&](const SingleDerivedPath::Opaque o) -> StorePath {
return o.path;
},
[&](const SingleDerivedPath::Built b) -> StorePath {
throw Error("argument '%s' did not evaluate to output of dynamic derivation '%s' which is not yet built.", i->what(), b.to_string(*store));
},
}, tryResolveDerivedPath(*store, *bfd.drvPath).raw()));
},
}, b.path.raw());

Expand Down

0 comments on commit eaaf7cc

Please sign in to comment.