From 1160a46b8bca5b1c7126a7df67a9b5ef2ed2ae6e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 12 Aug 2025 11:44:52 -0400
Subject: [PATCH] Make fewer assumptions in the windows override

---
 flake.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index d6356bd6..701aa109 100644
--- a/flake.nix
+++ b/flake.nix
@@ -198,16 +198,16 @@
               inherit version src;
               # On windows we use win32 threads to get a static binary,
               # otherwise `-static` below doesn't work.
-              stdenv = pkgs.overrideCC pkgs.stdenv (
-                pkgs.buildPackages.wrapCC (
-                  pkgs.buildPackages.gcc-unwrapped.override ({
+              stdenv = pkgs.stdenv.override (old: {
+                cc = old.cc.override (old: {
+                  cc = old.cc.override {
                     threadsCross = {
                       model = "win32";
                       package = null;
                     };
-                  })
-                )
-              );
+                  };
+                });
+              });
             }).overrideAttrs
               (old: {
                 NIX_CFLAGS_COMPILE = "-static";