diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-07 22:05:46 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-07 22:05:46 +0000 |
| commit | bb889c360545d010f2e558bdcd56a621e318bd5f (patch) | |
| tree | 6debbc75bfdd570ab1f00becc1026c07f250b94c /pkgs/development/libraries/zlib | |
| parent | f5a2998c03e5035858cab0a036e8f55add872ba9 (diff) | |
| download | nixpkgs-bb889c360545d010f2e558bdcd56a621e318bd5f.tar nixpkgs-bb889c360545d010f2e558bdcd56a621e318bd5f.tar.gz nixpkgs-bb889c360545d010f2e558bdcd56a621e318bd5f.tar.bz2 nixpkgs-bb889c360545d010f2e558bdcd56a621e318bd5f.tar.lz nixpkgs-bb889c360545d010f2e558bdcd56a621e318bd5f.tar.xz nixpkgs-bb889c360545d010f2e558bdcd56a621e318bd5f.tar.zst nixpkgs-bb889c360545d010f2e558bdcd56a621e318bd5f.zip | |
* Revert both r30278 (cmake upgrade) and r30307 (zlib fix to get cmake
to build). These are more appropriate to the stdenv branch. I'll apply them there. svn path=/nixpkgs/trunk/; revision=30308
Diffstat (limited to 'pkgs/development/libraries/zlib')
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b4773942141..f1b8a006ecf 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation (rec { sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; }; - patches = [ ./zlib-LARGEFILE64_SOURCE.patch ]; - configureFlags = if static then "" else "--shared"; preConfigure = '' diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch deleted file mode 100644 index ff308ba3f5e..00000000000 --- a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch +++ /dev/null @@ -1,14 +0,0 @@ - Fix compilation with _LARGEFILE64_SOURCE - -diff -ur zlib-1.2.5.orig/zlib.h zlib-1.2.5/zlib.h ---- zlib-1.2.5.orig/zlib.h 2010-04-20 06:12:48.000000000 +0200 -+++ zlib-1.2.5/zlib.h 2010-09-27 21:20:27.398694997 +0200 -@@ -1578,7 +1578,7 @@ - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - 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)); |