From 9150ccb89e1da05ac731f34a860022a69a215edd Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 12 Oct 2025 13:16:50 -0400
Subject: [PATCH 1/2] Fix Windows dev shell (mostly)

gbenchmark still has too-narrow supported systems, however. That needs
to be fixed in Nixpkgs.
---
 tests/functional/package.nix | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/tests/functional/package.nix b/tests/functional/package.nix
index 1f1d10ea8..a36c2e2d3 100644
--- a/tests/functional/package.nix
+++ b/tests/functional/package.nix
@@ -2,16 +2,7 @@
   lib,
   stdenv,
   mkMesonDerivation,
-
-  meson,
-  ninja,
-  pkg-config,
-
-  jq,
-  git,
-  mercurial,
-  util-linux,
-  unixtools,
+  buildPackages,
 
   nix-store,
   nix-expr,
@@ -46,16 +37,17 @@ mkMesonDerivation (
       ./.
     ];
 
-    # Hack for sake of the dev shell
+    # Hack for sake of the dev shell. Need to "manually splice" since
+    # this isn't a specially-recognized list of dependencies.
     passthru.externalNativeBuildInputs = [
-      meson
-      ninja
-      pkg-config
+      buildPackages.meson
+      buildPackages.ninja
+      buildPackages.pkg-config
 
-      jq
-      git
-      mercurial
-      unixtools.script
+      buildPackages.jq
+      buildPackages.git
+      buildPackages.mercurial
+      buildPackages.unixtools.script
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       # For various sandboxing tests that needs a statically-linked shell,
@@ -64,7 +56,7 @@ mkMesonDerivation (
       # For Overlay FS tests need `mount`, `umount`, and `unshare`.
       # For `script` command (ensuring a TTY)
       # TODO use `unixtools` to be precise over which executables instead?
-      util-linux
+      buildPackages.util-linux
     ];
 
     nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [

From 10223fae8623ce2b919f620878bf7af2a95a8680 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 12 Oct 2025 13:22:14 -0400
Subject: [PATCH 2/2] Fix windows build

I forget to add some CPP in b57caaa1a273323b596097ab5509797b38e2e272.

Hopefully, as we relyon RAII more, these explicit resets become
unneeded.
---
 src/libstore/build/derivation-building-goal.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libstore/build/derivation-building-goal.cc b/src/libstore/build/derivation-building-goal.cc
index 6bda17d37..037401ccb 100644
--- a/src/libstore/build/derivation-building-goal.cc
+++ b/src/libstore/build/derivation-building-goal.cc
@@ -495,7 +495,9 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
                             Magenta(
                                 "/usr/sbin/softwareupdate --install-rosetta && launchctl stop org.nixos.nix-daemon"));
 
+#ifndef _WIN32 // TODO enable `DerivationBuilder` on Windows
                     builder.reset();
+#endif
                     outputLocks.unlock();
                     worker.permanentFailure = true;
                     co_return doneFailure({BuildResult::Failure::InputRejected, std::move(msg)});