2 files changed, 8 insertions, 8 deletions

diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index af1c69b87..e04954d45 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -419,13 +419,13 @@ static void queryInstSources(EvalState & state,
 
 static void printMissing(EvalState & state, DrvInfos & elems)
 {
-    std::vector<BuildableReq> targets;
+    std::vector<DerivedPath> targets;
     for (auto & i : elems) {
         Path drvPath = i.queryDrvPath();
         if (drvPath != "")
-            targets.push_back(BuildableReqFromDrv{state.store->parseStorePath(drvPath)});
+            targets.push_back(DerivedPath::Built{state.store->parseStorePath(drvPath)});
         else
-            targets.push_back(BuildableOpaque{state.store->parseStorePath(i.queryOutPath())});
+            targets.push_back(DerivedPath::Opaque{state.store->parseStorePath(i.queryOutPath())});
     }
 
     printMissing(state.store, targets);
@@ -694,12 +694,12 @@ static void opSet(Globals & globals, Strings opFlags, Strings opArgs)
     if (globals.forceName != "")
         drv.setName(globals.forceName);
 
-    std::vector<BuildableReq> paths {
+    std::vector<DerivedPath> paths {
         (drv.queryDrvPath() != "")
-        ? (BuildableReq) (BuildableReqFromDrv {
+        ? (DerivedPath) (DerivedPath::Built {
                 globals.state->store->parseStorePath(drv.queryDrvPath())
             })
-        : (BuildableReq) (BuildableOpaque {
+        : (DerivedPath) (DerivedPath::Opaque {
                 globals.state->store->parseStorePath(drv.queryOutPath())
             }),
     };
diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc
index 0ccf960fb..5ceb2ae67 100644
--- a/src/nix-env/user-env.cc
+++ b/src/nix-env/user-env.cc
@@ -43,7 +43,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
 
     debug(format("building user environment dependencies"));
     state.store->buildPaths(
-        toBuildableReqs(drvsToBuild),
+        toDerivedPaths(drvsToBuild),
         state.repair ? bmRepair : bmNormal);
 
     /* Construct the whole top level derivation. */
@@ -140,7 +140,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
     std::vector<StorePathWithOutputs> topLevelDrvs;
     topLevelDrvs.push_back({topLevelDrv});
     state.store->buildPaths(
-        toBuildableReqs(topLevelDrvs),
+        toDerivedPaths(topLevelDrvs),
         state.repair ? bmRepair : bmNormal);
 
     /* Switch the current user environment to the output path. */