diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-04-21 10:00:35 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-04-21 10:00:35 +0200 |
| commit | 625d7b9043be673a8df33cc842ec5032d7705c06 (patch) | |
| tree | 38777f48f2bb7b403b3e9f148000d0ffa8026cde /pkgs/development/libraries/zlib | |
| parent | cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d (diff) | |
| parent | 2d3376e84e4a24ca10480a9ade972db1e5c54e9f (diff) | |
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X and could possibly fix things even for non-cross-builds, like for example OpenSSL on Windows. The main reason for merging this in 14.04 already is that we already have runInWindowsVM in master and it doesn't work until we actually cross-build Cygwin's setup binary as the upstream version is a fast moving target which gets _overwritten_ on every new release. Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/zlib')
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index f1eea80ab7a36..088eb1b949300 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { "-f" "win32/Makefile.gcc" "PREFIX=${stdenv.cross.config}-" ] ++ (if static then [] else [ "SHARED_MODE=1" ]); + } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { + makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ]; }; # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. |