windows.pthreads: Remove win32-pthreads, exclusively use mingwW64 pthreads (#430165)

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"

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/).
 

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 [

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

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

pkgs/os-specific/windows/default.nix

@@ -31,13 +31,13 @@ lib.makeScope newScope (
 
     mingw_w64_headers = callPackage ./mingw-w64/headers.nix { };
 
-    mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = crossThreadsStdenv; };
+    mingw_w64_pthreads = lib.warn "windows.mingw_w64_pthreads is deprecated, windows.pthreads should be preferred" self.pthreads;
 
     mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; };
 
     npiperelay = callPackage ./npiperelay { };
 
-    pthreads = callPackage ./pthread-w32 { };
+    pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = crossThreadsStdenv; };
 
     libgnurx = callPackage ./libgnurx { };
 

pkgs/os-specific/windows/pthread-w32/default.nix

@@ -1,37 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-}:
-
-stdenv.mkDerivation {
-  pname = "pthreads-w32";
-  version = "2.9.1";
-
-  src = fetchzip {
-    url = "https://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.tar.gz";
-    hash = "sha256-PHlICSHvPNoTXEOituTmozEgu/oTyAZVQuIb8I63Eek=";
-  };
-
-  makeFlags = [
-    "CROSS=${stdenv.cc.targetPrefix}"
-    "GC-static"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -D libpthreadGC2.a $out/lib/libpthread.a
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "POSIX threads library for Windows";
-    homepage = "https://sourceware.org/pthreads-win32";
-    license = lib.licenses.lgpl21Plus;
-    maintainers = [ lib.maintainers.RossSmyth ];
-    platforms = lib.platforms.windows;
-    teams = [ lib.teams.windows ];
-  };
-}

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 [ ]
+      attrs.propagatedBuildInputs or [ ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;
-      ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
     configureFlags = [
       "--enable-xkb"
       "--enable-xinput"

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 = {