aboutsummaryrefslogtreecommitdiff
path: root/src/nix/develop.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/nix/develop.cc')
-rw-r--r--src/nix/develop.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 616e2073e..7cc7b85be 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -160,7 +160,7 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
auto shellDrvPath = writeDerivation(*store, drv);
/* Build the derivation. */
- store->buildPaths({BuildableReqFromDrv{shellDrvPath}});
+ store->buildPaths({DerivedPath::Built{shellDrvPath}});
for (auto & [_0, outputAndOptPath] : drv.outputsAndOptPaths(*store)) {
auto & [_1, optPath] = outputAndOptPath;
@@ -265,7 +265,7 @@ struct Common : InstallableCommand, MixProfile
for (auto & [installable_, dir_] : redirects) {
auto dir = absPath(dir_);
auto installable = parseInstallable(store, installable_);
- auto buildable = installable->toBuildable();
+ auto buildable = installable->toDerivedPathWithHints();
auto doRedirect = [&](const StorePath & path)
{
auto from = store->printStorePath(path);
@@ -277,14 +277,14 @@ struct Common : InstallableCommand, MixProfile
}
};
std::visit(overloaded {
- [&](const BuildableOpaque & bo) {
+ [&](const DerivedPathWithHints::Opaque & bo) {
doRedirect(bo.path);
},
- [&](const BuildableFromDrv & bfd) {
+ [&](const DerivedPathWithHints::Built & bfd) {
for (auto & [outputName, path] : bfd.outputs)
if (path) doRedirect(*path);
},
- }, buildable);
+ }, buildable.raw());
}
return rewriteStrings(script, rewrites);