colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30847
This commit is contained in:
Eelco Dolstra 2011-12-12 13:45:24 +00:00
parent 32b3de1f96
commit ef7b97bade
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/zlib/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, static ? false}: { stdenv, fetchurl, static ? false }:
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "zlib-1.2.5"; name = "zlib-1.2.5";
src = fetchurl { src = fetchurl {
@ -8,7 +8,9 @@ stdenv.mkDerivation (rec {
sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; 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"; 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. # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.
cygwinConfigureEnableShared = true; cygwinConfigureEnableShared = true;
}
} // stdenv.lib.optionalAttrs (stdenv.system == "i686-cygwin") {
patches = [ ./no-shared.patch ];
})

8
pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch
View File

@ -4,8 +4,8 @@ http://mail.madler.net/pipermail/zlib-devel_madler.net/2011-June/002583.html
Mark Adler madler at madler.net Mark Adler madler at madler.net
*** ../zlib-1.2.5/zlib.h 2010-04-19 21:12:48.000000000 -0700 *** a/zlib.h 2010-04-19 21:12:48.000000000 -0700
--- zlib.h 2011-02-26 21:23:30.000000000 -0800 --- b/zlib.h 2011-02-26 21:23:30.000000000 -0800
*************** ***************
*** 1572,1584 **** *** 1572,1584 ****
#endif #endif
@ -44,8 +44,8 @@ Mark Adler madler at madler.net
ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); 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 gzseek64 OF((gzFile, z_off_t, int));
ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
*** ../zlib-1.2.5/zconf.h.in 2010-04-18 10:58:06.000000000 -0700 *** a/zconf.h.in 2010-04-18 10:58:06.000000000 -0700
--- zconf.h.in 2010-07-18 09:05:49.000000000 -0700 --- b/zconf.h.in 2010-07-18 09:05:49.000000000 -0700
*************** ***************
*** 374,380 **** *** 374,380 ****
# undef _LARGEFILE64_SOURCE # undef _LARGEFILE64_SOURCE