diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2023-09-08 14:29:39 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2023-09-08 10:56:08 +0000 |
| commit | a81e3dcd759ffb44348186bdc3751af9ea2f1005 (patch) | |
| tree | 4c3b7609850f9800d06fc7388494b66de59b7a81 /pkgs/development/libraries/boost | |
| parent | 127ddbae4a8bc78fdf712a2434d414e8f2150ac0 (diff) | |
| download | nixpkgs-a81e3dcd759ffb44348186bdc3751af9ea2f1005.tar nixpkgs-a81e3dcd759ffb44348186bdc3751af9ea2f1005.tar.gz nixpkgs-a81e3dcd759ffb44348186bdc3751af9ea2f1005.tar.bz2 nixpkgs-a81e3dcd759ffb44348186bdc3751af9ea2f1005.tar.lz nixpkgs-a81e3dcd759ffb44348186bdc3751af9ea2f1005.tar.xz nixpkgs-a81e3dcd759ffb44348186bdc3751af9ea2f1005.tar.zst nixpkgs-a81e3dcd759ffb44348186bdc3751af9ea2f1005.zip | |
treewide: replace libc == "msvcrt" with isMinGW
msvcrt is only one of the libcs in MinGW. We therefore replace explictly testing for msvcrt with the isMinGW predicate. This lays the foundation for ucrt64 support.
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index f3994e4dc14..f989d285916 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -9,7 +9,7 @@ , enableDebug ? false , enableSingleThreaded ? false , enableMultiThreaded ? true -, enableShared ? !(with stdenv.hostPlatform; isStatic || libc == "msvcrt") # problems for now +, enableShared ? !(with stdenv.hostPlatform; isStatic || isMinGW) # problems for now , enableStatic ? !enableShared , enablePython ? false , enableNumpy ? false @@ -91,7 +91,7 @@ let ++ lib.optional (!enablePython) "--without-python" ++ lib.optional needUserConfig "--user-config=user-config.jam" ++ lib.optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off" - ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ + ++ lib.optionals stdenv.hostPlatform.isMinGW [ "threadapi=win32" ] ++ extraB2Args ); @@ -252,7 +252,7 @@ stdenv.mkDerivation { # Make boost header paths relative so that they are not runtime dependencies cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \; - '' + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' + '' + lib.optionalString stdenv.hostPlatform.isMinGW '' $RANLIB "$out/lib/"*.a ''; |