rocksdb, s7, python3, flint, release-cross: mingw_w64_pthreads -> pthreads
This commit is contained in:
parent
8e2c959cdb
commit
bb7c7900e1
@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
buildInputs =
|
buildInputs =
|
||||||
lib.optional enableJemalloc jemalloc
|
lib.optional enableJemalloc jemalloc
|
||||||
++ lib.optional enableLiburing liburing
|
++ lib.optional enableLiburing liburing
|
||||||
++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
|
++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
|
|||||||
@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
libmpc
|
libmpc
|
||||||
]
|
]
|
||||||
++ lib.optional withNrepl notcurses
|
++ 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/).
|
# The following scripts are modified from [Guix's](https://packages.guix.gnu.org/packages/s7/).
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||||||
openssl
|
openssl
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isMinGW [
|
++ lib.optionals stdenv.hostPlatform.isMinGW [
|
||||||
windows.mingw_w64_pthreads
|
windows.pthreads
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = lib.optionals stdenv.hostPlatform.isMinGW [
|
patches = lib.optionals stdenv.hostPlatform.isMinGW [
|
||||||
|
|||||||
@ -248,7 +248,7 @@ let
|
|||||||
]
|
]
|
||||||
++ optionals stdenv.hostPlatform.isMinGW [
|
++ optionals stdenv.hostPlatform.isMinGW [
|
||||||
windows.dlfcn
|
windows.dlfcn
|
||||||
windows.mingw_w64_pthreads
|
windows.pthreads
|
||||||
]
|
]
|
||||||
++ optionals tzdataSupport [
|
++ optionals tzdataSupport [
|
||||||
tzdata
|
tzdata
|
||||||
|
|||||||
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||||||
ntl
|
ntl
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isMinGW [
|
++ lib.optionals stdenv.hostPlatform.isMinGW [
|
||||||
windows.mingw_w64_pthreads
|
windows.pthreads
|
||||||
];
|
];
|
||||||
|
|
||||||
# We're not using autoreconfHook because flint's bootstrap
|
# We're not using autoreconfHook because flint's bootstrap
|
||||||
|
|||||||
@ -154,8 +154,7 @@ self: super:
|
|||||||
libxcb = super.libxcb.overrideAttrs (attrs: {
|
libxcb = super.libxcb.overrideAttrs (attrs: {
|
||||||
# $dev/include/xcb/xcb.h includes pthread.h
|
# $dev/include/xcb/xcb.h includes pthread.h
|
||||||
propagatedBuildInputs =
|
propagatedBuildInputs =
|
||||||
attrs.propagatedBuildInputs or [ ]
|
attrs.propagatedBuildInputs or [ ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;
|
||||||
++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--enable-xkb"
|
"--enable-xkb"
|
||||||
"--enable-xinput"
|
"--enable-xinput"
|
||||||
|
|||||||
@ -109,7 +109,7 @@ let
|
|||||||
libffi = nativePlatforms;
|
libffi = nativePlatforms;
|
||||||
libtool = nativePlatforms;
|
libtool = nativePlatforms;
|
||||||
libunistring = nativePlatforms;
|
libunistring = nativePlatforms;
|
||||||
windows.mingw_w64_pthreads = nativePlatforms;
|
windows.pthreads = nativePlatforms;
|
||||||
};
|
};
|
||||||
|
|
||||||
wasiCommon = {
|
wasiCommon = {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user