* Fix the zlib build (the patch didn't apply).

svn path=/nixpkgs/branches/stdenv-updates/; revision=30847

2 files changed, 10 insertions, 11 deletions

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 6af8126f5a975..a2f11bca87d4b 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, static ? false}:
+{ stdenv, fetchurl, static ? false }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "zlib-1.2.5";
   
   src = fetchurl {
@@ -8,7 +8,9 @@ stdenv.mkDerivation (rec {
     sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30";
   };
 
-  patches = [ ./zlib-LARGEFILE64_SOURCE.patch ];
+  patches =
+    [ ./zlib-LARGEFILE64_SOURCE.patch ]
+    ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") [ ./no-shared.patch ];
 
   configureFlags = if static then "" else "--shared";
 
@@ -37,7 +39,4 @@ 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 ];
-})
+}
diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch
index 5278d81ba8324..6ddb0ad706663 100644
--- a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch
+++ b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch
@@ -4,8 +4,8 @@ http://mail.madler.net/pipermail/zlib-devel_madler.net/2011-June/002583.html
 
 Mark Adler madler at madler.net
 
-*** ../zlib-1.2.5/zlib.h    2010-04-19 21:12:48.000000000 -0700
---- zlib.h  2011-02-26 21:23:30.000000000 -0800
+*** a/zlib.h    2010-04-19 21:12:48.000000000 -0700
+--- b/zlib.h  2011-02-26 21:23:30.000000000 -0800
 ***************
 *** 1572,1584 ****
   #endif
@@ -44,8 +44,8 @@ Mark Adler madler at madler.net
        ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
        ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
        ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-*** ../zlib-1.2.5/zconf.h.in    2010-04-18 10:58:06.000000000 -0700
---- zconf.h.in  2010-07-18 09:05:49.000000000 -0700
+*** a/zconf.h.in    2010-04-18 10:58:06.000000000 -0700
+--- b/zconf.h.in  2010-07-18 09:05:49.000000000 -0700
 ***************
 *** 374,380 ****
   #  undef _LARGEFILE64_SOURCE