diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
| commit | 16be434b0bec4d14a893010b46f56a64cab74cc1 (patch) | |
| tree | 25e77807d55c76d42817197d576349478ff500a5 /pkgs/development/libraries/zlib | |
| parent | d76bc8ed15cfa21d9f1cc47a06ee1fe8ac86d6d3 (diff) | |
| parent | b0ada07f36abc21c990000b5cdbe780157d6b92b (diff) | |
| download | nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.gz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.bz2 nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.lz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.xz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.zst nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.zip | |
Merge accepted cross compilation PRs into staging
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 2278453c492c..eab36c21dc2b 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -62,7 +62,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" @@ -70,14 +70,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; |