From 9fe90d264eb3624a16e63c0db74b4927957d1127 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 1 Aug 2025 16:55:08 -0400
Subject: [PATCH 1/2] windows.mcfgthreads: 1.9.3 -> 2.1.1

---
 .../windows/mcfgthreads/default.nix           | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix
index 11ec8db38797..c407cf5b7e47 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@@ -1,20 +1,25 @@
 {
   lib,
   stdenv,
+  writeScriptBin,
   fetchFromGitHub,
   meson,
   ninja,
 }:
-
-stdenv.mkDerivation rec {
+let
+  dllTool = writeScriptBin "dlltool" ''
+    ${stdenv.cc.targetPrefix}dlltool "$@"
+  '';
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "mcfgthread";
-  version = "1.9.2";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "lhmouse";
     repo = "mcfgthread";
-    rev = "v${lib.versions.majorMinor version}-ga.${lib.versions.patch version}";
-    hash = "sha256-bB7ghhSqAqkyU1PLuVVJfkTYTtEU9f0CR1k+k+u3EgY=";
+    tag = "v${lib.versions.majorMinor finalAttrs.version}-ga.${lib.versions.patch finalAttrs.version}";
+    hash = "sha256-kEqS1+2CB/Ryor2WbI67KALnlTcD9oSFEdC6Av73roE=";
   };
 
   postPatch = ''
@@ -27,6 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    dllTool
     meson
     ninja
   ];
@@ -36,6 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/lhmouse/mcfgthread/wiki";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ wegank ];
+    teams = [ lib.teams.windows ];
     platforms = lib.platforms.windows;
   };
-}
+})

From d2ac4dfa61fba987a84a0a81555da57ae0b9a2b0 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 1 Aug 2025 17:33:53 -0400
Subject: [PATCH 2/2] go: isWindows -> isMinGW

---
 pkgs/development/compilers/go/1.23.nix | 2 +-
 pkgs/development/compilers/go/1.24.nix | 2 +-
 pkgs/development/compilers/go/1.25.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index 904b2c29a54c..7777d9da57f1 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildTarget = lib.optional isCross targetCC;
 
-  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;
+  depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
 
   postPatch = ''
     patchShebangs .
diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index 15fa9266bd05..a3fc7aea6e48 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildTarget = lib.optional isCross targetCC;
 
-  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;
+  depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
 
   postPatch = ''
     patchShebangs .
diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix
index bd118bf135f1..e16420b80e38 100644
--- a/pkgs/development/compilers/go/1.25.nix
+++ b/pkgs/development/compilers/go/1.25.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildTarget = lib.optional isCross targetCC;
 
-  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;
+  depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
 
   postPatch = ''
     patchShebangs .