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

authored by John Ericson and committed by GitHub b4b350d8 14f612c4

+9 -47
+1 -1
pkgs/by-name/ro/rocksdb/package.nix
··· 49 49 buildInputs = 50 50 lib.optional enableJemalloc jemalloc 51 51 ++ lib.optional enableLiburing liburing 52 - ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads; 52 + ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; 53 53 54 54 outputs = [ 55 55 "out"
+1 -1
pkgs/by-name/s7/s7/package.nix
··· 43 43 libmpc 44 44 ] 45 45 ++ lib.optional withNrepl notcurses 46 - ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads; 46 + ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; 47 47 48 48 # The following scripts are modified from [Guix's](https://packages.guix.gnu.org/packages/s7/). 49 49
+1 -1
pkgs/by-name/sr/srt/package.nix
··· 24 24 openssl 25 25 ] 26 26 ++ lib.optionals stdenv.hostPlatform.isMinGW [ 27 - windows.mingw_w64_pthreads 27 + windows.pthreads 28 28 ]; 29 29 30 30 patches = lib.optionals stdenv.hostPlatform.isMinGW [
+1 -1
pkgs/development/interpreters/python/cpython/default.nix
··· 248 248 ] 249 249 ++ optionals stdenv.hostPlatform.isMinGW [ 250 250 windows.dlfcn 251 - windows.mingw_w64_pthreads 251 + windows.pthreads 252 252 ] 253 253 ++ optionals tzdataSupport [ 254 254 tzdata
+1 -1
pkgs/development/libraries/flint/3.nix
··· 51 51 ntl 52 52 ] 53 53 ++ lib.optionals stdenv.hostPlatform.isMinGW [ 54 - windows.mingw_w64_pthreads 54 + windows.pthreads 55 55 ]; 56 56 57 57 # We're not using autoreconfHook because flint's bootstrap
+2 -2
pkgs/os-specific/windows/default.nix
··· 31 31 32 32 mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; 33 33 34 - mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = crossThreadsStdenv; }; 34 + mingw_w64_pthreads = lib.warn "windows.mingw_w64_pthreads is deprecated, windows.pthreads should be preferred" self.pthreads; 35 35 36 36 mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; }; 37 37 38 38 npiperelay = callPackage ./npiperelay { }; 39 39 40 - pthreads = callPackage ./pthread-w32 { }; 40 + pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = crossThreadsStdenv; }; 41 41 42 42 libgnurx = callPackage ./libgnurx { }; 43 43
-37
pkgs/os-specific/windows/pthread-w32/default.nix
··· 1 - { 2 - lib, 3 - stdenv, 4 - fetchzip, 5 - }: 6 - 7 - stdenv.mkDerivation { 8 - pname = "pthreads-w32"; 9 - version = "2.9.1"; 10 - 11 - src = fetchzip { 12 - url = "https://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.tar.gz"; 13 - hash = "sha256-PHlICSHvPNoTXEOituTmozEgu/oTyAZVQuIb8I63Eek="; 14 - }; 15 - 16 - makeFlags = [ 17 - "CROSS=${stdenv.cc.targetPrefix}" 18 - "GC-static" 19 - ]; 20 - 21 - installPhase = '' 22 - runHook preInstall 23 - 24 - install -D libpthreadGC2.a $out/lib/libpthread.a 25 - 26 - runHook postInstall 27 - ''; 28 - 29 - meta = { 30 - description = "POSIX threads library for Windows"; 31 - homepage = "https://sourceware.org/pthreads-win32"; 32 - license = lib.licenses.lgpl21Plus; 33 - maintainers = [ lib.maintainers.RossSmyth ]; 34 - platforms = lib.platforms.windows; 35 - teams = [ lib.teams.windows ]; 36 - }; 37 - }
+1 -2
pkgs/servers/x11/xorg/overrides.nix
··· 154 154 libxcb = super.libxcb.overrideAttrs (attrs: { 155 155 # $dev/include/xcb/xcb.h includes pthread.h 156 156 propagatedBuildInputs = 157 - attrs.propagatedBuildInputs or [ ] 158 - ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads; 157 + attrs.propagatedBuildInputs or [ ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; 159 158 configureFlags = [ 160 159 "--enable-xkb" 161 160 "--enable-xinput"
+1 -1
pkgs/top-level/release-cross.nix
··· 109 109 libffi = nativePlatforms; 110 110 libtool = nativePlatforms; 111 111 libunistring = nativePlatforms; 112 - windows.mingw_w64_pthreads = nativePlatforms; 112 + windows.pthreads = nativePlatforms; 113 113 }; 114 114 115 115 wasiCommon = {