rocksdb, s7, python3, flint, release-cross: mingw_w64_pthreads -> pthreads

This commit is contained in:
Ross Smyth 2025-08-01 12:51:39 -04:00
parent 8e2c959cdb
commit bb7c7900e1
7 changed files with 7 additions and 8 deletions

View File

@ -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"

View File

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

View File

@ -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 [

View File

@ -248,7 +248,7 @@ let
]
++ optionals stdenv.hostPlatform.isMinGW [
windows.dlfcn
windows.mingw_w64_pthreads
windows.pthreads
]
++ optionals tzdataSupport [
tzdata

View File

@ -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

View File

@ -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"

View File

@ -109,7 +109,7 @@ let
libffi = nativePlatforms;
libtool = nativePlatforms;
libunistring = nativePlatforms;
windows.mingw_w64_pthreads = nativePlatforms;
windows.pthreads = nativePlatforms;
};
wasiCommon = {