diff options
| author | Janne Heß <janne@hess.ooo> | 2022-05-18 13:50:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-18 13:50:23 +0200 |
| commit | c911240e9cc2a7c12c985bd32700b9657b5698a9 (patch) | |
| tree | dbc3be92b092f469cb5c633f22e907adcc531492 /pkgs/development/libraries/zlib | |
| parent | 7456be85db41b32e0f3e2e7bd4371d4d4bd15816 (diff) | |
| download | nixpkgs-c911240e9cc2a7c12c985bd32700b9657b5698a9.tar nixpkgs-c911240e9cc2a7c12c985bd32700b9657b5698a9.tar.gz nixpkgs-c911240e9cc2a7c12c985bd32700b9657b5698a9.tar.bz2 nixpkgs-c911240e9cc2a7c12c985bd32700b9657b5698a9.tar.lz nixpkgs-c911240e9cc2a7c12c985bd32700b9657b5698a9.tar.xz nixpkgs-c911240e9cc2a7c12c985bd32700b9657b5698a9.tar.zst nixpkgs-c911240e9cc2a7c12c985bd32700b9657b5698a9.zip | |
Revert "Add mingwW64-llvm cross-system."
Diffstat (limited to 'pkgs/development/libraries/zlib')
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index ed7ff17dc3d..9b9938746ca 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (rec { '' # Non-typical naming confuses libtool which then refuses to use zlib's DLL # in some cases, e.g. when compiling libpng. - + lib.optionalString (stdenv.hostPlatform.isMinGW && shared) '' + + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt" && shared) '' ln -s zlib1.dll $out/bin/libz.dll ''; @@ -101,7 +101,7 @@ stdenv.mkDerivation (rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static; configurePlatforms = []; - installFlags = lib.optionals (stdenv.hostPlatform.isMinGW) [ + installFlags = lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "BINARY_PATH=$(out)/bin" "INCLUDE_PATH=$(dev)/include" "LIBRARY_PATH=$(out)/lib" @@ -112,7 +112,7 @@ stdenv.mkDerivation (rec { makeFlags = [ "PREFIX=${stdenv.cc.targetPrefix}" - ] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ + ] ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" ] ++ lib.optionals shared [ # Note that as of writing (zlib 1.2.11), this flag only has an effect @@ -134,6 +134,6 @@ stdenv.mkDerivation (rec { preConfigure = '' export CHOST=${stdenv.hostPlatform.config} ''; -} // lib.optionalAttrs (stdenv.hostPlatform.isMinGW) { +} // lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { dontConfigure = true; }) |