From 3fc74479c344a7efc9270b2fd6d5f7b1ee29cece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 14 Nov 2023 00:22:41 +0100
Subject: [PATCH] Fix closureInfo copy

---
 packages.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages.nix b/packages.nix
index ae08af79..7ec30dac 100644
--- a/packages.nix
+++ b/packages.nix
@@ -202,16 +202,19 @@ lib.attrsets.mapAttrs
 
         "microvm-update-${name}" = pkgs.writeScriptBin "microvm-update-${name}" (
           if builtins.elem (hostConfig.c3d2.deployment.server or null) [ "server9" "server10" ]
-          then ''
+          then let
+            closureInfo = pkgs.closureInfo { rootPaths = [ hostConfig.system.build.toplevel.outPath ]; };
+          in ''
             set -eou pipefail
 
-            ${hostConfig.system.build.copyToServer} ${declaredRunnerDrvPath}
+            ${hostConfig.system.build.copyToServer} ${declaredRunnerDrvPath} ${discardStringCtx closureInfo.drvPath}
 
             ${hostConfig.system.build.runOnServer} NIXOS_REBUILD="''${NIXOS_REBUILD:-}" bash -e <<END
             set -eou pipefail
             ${createDirsCopyCurrent name}
 
             nix build -L --accept-flake-config -o current ${declaredRunnerDrvPath}
+            nix build -L --accept-flake-config --no-link ${discardStringCtx closureInfo.drvPath}
             echo '${selfRef}' > flake
 
             ${createSymlinks name}
@@ -222,7 +225,7 @@ lib.attrsets.mapAttrs
             fi
             END
 
-            if [[ -n ''${NIXOS_REBUILD:-} ]]; then
+            if [[ -n \''${NIXOS_REBUILD:-} ]]; then
               echo "Switching to configuration..."
               ssh ${target} bash -e <<END
               set -eou pipefail
@@ -234,7 +237,7 @@ lib.attrsets.mapAttrs
               fi
 
               # refresh nix db which is required for nix-env -p ... --set
-              ${discardStringCtx hostConfig.nix.package}/bin/nix-store --load-db < ${discardStringCtx (pkgs.closureInfo { rootPaths = [ hostConfig.system.build.toplevel.outPath ]; })}
+              ${discardStringCtx hostConfig.nix.package}/bin/nix-store --load-db < ${discardStringCtx closureInfo}
               ${discardStringCtx hostConfig.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set ${toplevelOutPath}
               ${toplevelOutPath}/bin/switch-to-configuration "''${@:-switch}"
             END