diff options
| author | John Ericson <git@JohnEricson.me> | 2023-09-08 22:40:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-08 22:40:14 -0400 |
| commit | e829eca8860c81e5126d1723779b1b1cc0da2a14 (patch) | |
| tree | b57b807883f07b6dcc8868a50832830045271729 /pkgs/development/libraries/boost | |
| parent | b89a0c676a402ad91bdfedc71b1ce924e07f5226 (diff) | |
| parent | 1e0561d78a3d3cd84bac45ab474af82e32802120 (diff) | |
| download | nixpkgs-e829eca8860c81e5126d1723779b1b1cc0da2a14.tar nixpkgs-e829eca8860c81e5126d1723779b1b1cc0da2a14.tar.gz nixpkgs-e829eca8860c81e5126d1723779b1b1cc0da2a14.tar.bz2 nixpkgs-e829eca8860c81e5126d1723779b1b1cc0da2a14.tar.lz nixpkgs-e829eca8860c81e5126d1723779b1b1cc0da2a14.tar.xz nixpkgs-e829eca8860c81e5126d1723779b1b1cc0da2a14.tar.zst nixpkgs-e829eca8860c81e5126d1723779b1b1cc0da2a14.zip | |
Merge pull request #253939 from angerman/angerman/ucrt64
Add ucrt64 mingw toolchain.
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 e46c03ed808..080c944c90f 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 ); @@ -259,7 +259,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 ''; |