[Nix-commits] SVN commit: nix - r30847 - nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib

[Eelco Dolstra]

Author: eelco
Date: Mon Dec 12 13:45:24 2011
New Revision: 30847
URL: https://nixos.org/websvn/nix/?rev=30847&sc=1

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

Modified:
   nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
   
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch

Modified: 
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix 
Mon Dec 12 08:35:37 2011        (r30846)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix 
Mon Dec 12 13:45:24 2011        (r30847)
@@ -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 @@
     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 @@
 
   # 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 ];
-})
+}

Modified: 
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch
==============================================================================
--- 
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch
       Mon Dec 12 08:35:37 2011        (r30846)
+++ 
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch
       Mon Dec 12 13:45:24 2011        (r30847)
@@ -4,8 +4,8 @@
 
 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 @@
        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
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits