From 0880b96a3d04a35ddad29a347e5607693723c9e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Nov 2011 22:54:45 +0000
Subject: [PATCH] * Apply the zlib/cmake updates from the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30309
---
 pkgs/development/libraries/zlib/default.nix        |  2 ++
 .../libraries/zlib/zlib-LARGEFILE64_SOURCE.patch   | 14 ++++++++++++++
 .../tools/build-managers/cmake/default.nix         |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 13157601e6f..6af8126f5a9 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -8,6 +8,8 @@ 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
new file mode 100644
index 00000000000..ff308ba3f5e
--- /dev/null
+++ b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch
@@ -0,0 +1,14 @@
+	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));
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index c7484ee6e84..249e441be5d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "4";
+  minorVersion = "6";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr";
+    sha256 = "13kjfpgsrsygz693bzaf2pf9avzr1r56r6znn3zqaz9nmj0rp6g6";
   };
 
   patches =