From 4ee5447414a5c4384360364910873b89e39c888b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 26 Nov 2023 20:27:43 +0100
Subject: [PATCH] Fix NIXOS_REBUILD=1 microvm deployment

---
 overlays/default.nix | 1 +
 packages.nix         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/overlays/default.nix b/overlays/default.nix
index fc7a67ba..c78489b9 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -102,6 +102,7 @@ with final; {
     stable = (prev.nixVersions.stable.override { withAWS = false; }).overrideAttrs ({ patches ? [ ], ...}: {
       patches = patches ++ [
         # request compression
+        # TODO: drop with 23.11
         (fetchpatch {
           url = "https://github.com/NixOS/nix/pull/7712.patch";
           sha256 = "sha256-mAx2h0/r7HayvTjMMxmewaD+L4OOB2gRJaQb3JEb0rk=";
diff --git a/packages.nix b/packages.nix
index 08953a72..3a991091 100644
--- a/packages.nix
+++ b/packages.nix
@@ -202,7 +202,7 @@ lib.attrsets.mapAttrs
         "microvm-update-${name}" = pkgs.writeScriptBin "microvm-update-${name}" (
           if builtins.elem (hostConfig.c3d2.deployment.server or null) [ "server9" "server10" ]
           then let
-            closureInfo = pkgs.closureInfo { rootPaths = [ hostConfig.system.build.toplevel.outPath ]; };
+            closureInfo = pkgs.closureInfo { rootPaths = [ hostConfig.system.build.toplevel ]; };
           in ''
             set -eou pipefail
 
@@ -235,7 +235,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 closureInfo}
+              ${discardStringCtx hostConfig.nix.package}/bin/nix-store --load-db < ${discardStringCtx closureInfo}/registration
               ${discardStringCtx hostConfig.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set ${toplevelOutPath}
               ${toplevelOutPath}/bin/switch-to-configuration "''${@:-switch}"
             END