Skip to content

Commit 6d186e5

Browse files
committed
Revert "TEMP no need to change this callsite"
This reverts commit dbf384faea2371044991b19bee8ed2e95e0e377a.
1 parent 1db7a7d commit 6d186e5

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/libcmd/installables.cc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,14 @@ StorePathSet Installable::toDerivations(
721721
: throw Error("argument '%s' did not evaluate to a derivation", i->what()));
722722
},
723723
[&](const DerivedPath::Built & bfd) {
724-
drvPaths.insert(resolveDerivedPath(*store, *bfd.drvPath));
724+
drvPaths.insert(std::visit(overloaded {
725+
[&](const SingleDerivedPath::Opaque o) -> StorePath {
726+
return o.path;
727+
},
728+
[&](const SingleDerivedPath::Built b) -> StorePath {
729+
throw Error("argument '%s' did not evaluate to output of dynamic derivation '%s' which is not yet built.", i->what(), b.to_string(*store));
730+
},
731+
}, tryResolveDerivedPath(*store, *bfd.drvPath).raw()));
725732
},
726733
}, b.path.raw());
727734

0 commit comments

Comments
 (0)