From bb7c7900e12028b655c1cfa4f0e82f7272df52f9 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 1 Aug 2025 12:51:39 -0400
Subject: [PATCH] rocksdb, s7, python3, flint, release-cross:
 mingw_w64_pthreads -> pthreads

---
 pkgs/by-name/ro/rocksdb/package.nix                      | 2 +-
 pkgs/by-name/s7/s7/package.nix                           | 2 +-
 pkgs/by-name/sr/srt/package.nix                          | 2 +-
 pkgs/development/interpreters/python/cpython/default.nix | 2 +-
 pkgs/development/libraries/flint/3.nix                   | 2 +-
 pkgs/servers/x11/xorg/overrides.nix                      | 3 +--
 pkgs/top-level/release-cross.nix                         | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ro/rocksdb/package.nix b/pkgs/by-name/ro/rocksdb/package.nix
index a700587105d6..bdc840137b09 100644
--- a/pkgs/by-name/ro/rocksdb/package.nix
+++ b/pkgs/by-name/ro/rocksdb/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs =
     lib.optional enableJemalloc jemalloc
     ++ lib.optional enableLiburing liburing
-    ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
+    ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index a63eedeb3231..78c5effc3fb6 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
       libmpc
     ]
     ++ lib.optional withNrepl notcurses
-    ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
+    ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;
 
   # The following scripts are modified from [Guix's](https://packages.guix.gnu.org/packages/s7/).
 
diff --git a/pkgs/by-name/sr/srt/package.nix b/pkgs/by-name/sr/srt/package.nix
index d703a325da27..d18eb371675b 100644
--- a/pkgs/by-name/sr/srt/package.nix
+++ b/pkgs/by-name/sr/srt/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     openssl
   ]
   ++ lib.optionals stdenv.hostPlatform.isMinGW [
-    windows.mingw_w64_pthreads
+    windows.pthreads
   ];
 
   patches = lib.optionals stdenv.hostPlatform.isMinGW [
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 661f7b642ae2..2d85ee51d3fb 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -248,7 +248,7 @@ let
     ]
     ++ optionals stdenv.hostPlatform.isMinGW [
       windows.dlfcn
-      windows.mingw_w64_pthreads
+      windows.pthreads
     ]
     ++ optionals tzdataSupport [
       tzdata
diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/development/libraries/flint/3.nix
index 23553d45cb8c..3546022dc4f5 100644
--- a/pkgs/development/libraries/flint/3.nix
+++ b/pkgs/development/libraries/flint/3.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     ntl
   ]
   ++ lib.optionals stdenv.hostPlatform.isMinGW [
-    windows.mingw_w64_pthreads
+    windows.pthreads
   ];
 
   # We're not using autoreconfHook because flint's bootstrap
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7752afca8594..55cc08171059 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -154,8 +154,7 @@ self: super:
   libxcb = super.libxcb.overrideAttrs (attrs: {
     # $dev/include/xcb/xcb.h includes pthread.h
     propagatedBuildInputs =
-      attrs.propagatedBuildInputs or [ ]
-      ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
+      attrs.propagatedBuildInputs or [ ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;
     configureFlags = [
       "--enable-xkb"
       "--enable-xinput"
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index d87aec1c5783..de853ce49675 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -109,7 +109,7 @@ let
     libffi = nativePlatforms;
     libtool = nativePlatforms;
     libunistring = nativePlatforms;
-    windows.mingw_w64_pthreads = nativePlatforms;
+    windows.pthreads = nativePlatforms;
   };
 
   wasiCommon = {