* Fix zlib 1.2.5 on Cygwin. (The Makefile doesn't support building

just a static library.) svn path=/nixpkgs/trunk/; revision=22748
2010-07-27 11:37:29 +00:00
parent 42016ca6aa
commit 3c57f1fd8a
2 changed files with 19 additions and 2 deletions
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, static ? false}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
  name = "zlib-1.2.5";
  
  src = fetchurl {
@@ -23,4 +23,7 @@ stdenv.mkDerivation rec {

  # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.
  cygwinConfigureEnableShared = true;
-}
+  
+} // stdenv.lib.optionalAttrs (stdenv.system == "i686-cygwin") {
+  patches = [ ./no-shared.patch ];
+})