From 2165fe3ca6825bc4e8699783f88f847ac41f8efb Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Mon, 16 Jan 2023 22:16:16 +0100
Subject: [PATCH] activatables: fix for new types

---
 src/libcmd/activatables.cc | 2 +-
 src/libcmd/activatables.hh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libcmd/activatables.cc b/src/libcmd/activatables.cc
index 490dba75d..b2082409d 100644
--- a/src/libcmd/activatables.cc
+++ b/src/libcmd/activatables.cc
@@ -17,7 +17,7 @@ void ActivatableCommand::prepare() {
                 getEvalState(),
                 std::move(installableFlake->flakeRef),
                 activationPackageAttrPath == "" ? fragment : fragment + "." + activationPackageAttrPath,
-                installableFlake->outputsSpec,
+                installableFlake->extendedOutputsSpec,
                 getDefaultFlakeAttrPaths(),
                 getDefaultFlakeAttrPathPrefixes(),
                 installableFlake->lockFlags
diff --git a/src/libcmd/activatables.hh b/src/libcmd/activatables.hh
index 7b564a55b..d90e8afca 100644
--- a/src/libcmd/activatables.hh
+++ b/src/libcmd/activatables.hh
@@ -42,7 +42,8 @@ void ActivatableBuildCommand<ActivatableCommand>::run(nix::ref<Store> store)
 
         for (auto & i : installableContext) {
             auto b = i->toDerivedPaths();
-            pathsToBuild.insert(pathsToBuild.end(), b.begin(), b.end());
+            for (auto & b : i->toDerivedPaths())
+                pathsToBuild.push_back(b.path);
         }
         printMissing(store, pathsToBuild, lvlError);
         return;