diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 14:23:59 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 18:31:37 -0400 |
commit | da668f66c79bd031b7231e0bd1090ec2d48d87c4 (patch) | |
tree | 67f9d4c7bf3f73db64fbc7830b88fdc5b6d7b174 /pkgs/development/libraries/zlib | |
parent | 895c361480d489b620c96966ea653bb91db2628a (diff) | |
download | nixpkgs-da668f66c79bd031b7231e0bd1090ec2d48d87c4.tar nixpkgs-da668f66c79bd031b7231e0bd1090ec2d48d87c4.tar.gz nixpkgs-da668f66c79bd031b7231e0bd1090ec2d48d87c4.tar.bz2 nixpkgs-da668f66c79bd031b7231e0bd1090ec2d48d87c4.tar.lz nixpkgs-da668f66c79bd031b7231e0bd1090ec2d48d87c4.tar.xz nixpkgs-da668f66c79bd031b7231e0bd1090ec2d48d87c4.tar.zst nixpkgs-da668f66c79bd031b7231e0bd1090ec2d48d87c4.zip |
zlib: cc-wrapper can be relied on to export this env var
Diffstat (limited to 'pkgs/development/libraries/zlib')
-rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index e6468771cd4..40334f0b462 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { crossAttrs = { dontStrip = static; configurePlatforms = []; - } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { installFlags = [ "BINARY_PATH=$(out)/bin" "INCLUDE_PATH=$(dev)/include" @@ -68,14 +68,12 @@ stdenv.mkDerivation rec { ]; makeFlags = [ "-f" "win32/Makefile.gcc" - "PREFIX=${stdenv.cross.config}-" + "PREFIX=${stdenv.cc.prefix}" ] ++ stdenv.lib.optional (!static) "SHARED_MODE=1"; # Non-typical naming confuses libtool which then refuses to use zlib's DLL # in some cases, e.g. when compiling libpng. postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll"; - } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { - makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ]; }; passthru.version = version; |