diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/zlib')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/zlib/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/zlib/default.nix b/nixpkgs/pkgs/development/libraries/zlib/default.nix index da8aac5229b6..a9fadf46c4b2 100644 --- a/nixpkgs/pkgs/development/libraries/zlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlib/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation (rec { postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ - --replace '/usr/bin/libtool' 'ar' \ - --replace 'AR="libtool"' 'AR="ar"' \ + --replace '/usr/bin/libtool' '${stdenv.cc.targetPrefix}ar' \ + --replace 'AR="libtool"' 'AR="${stdenv.cc.targetPrefix}ar"' \ --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' ''; @@ -84,7 +84,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.libc == "msvcrt") '' + + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt" && shared) '' ln -s zlib1.dll $out/bin/libz.dll ''; |