From cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 20:06:01 +0000
Subject: [PATCH] Adding the latest zlib, otherwise vlc does not build.

This also could be used for a newer cmake, or some trouble there was with libxml2.


svn path=/nixpkgs/trunk/; revision=32598
---
 pkgs/development/libraries/zlib/latest.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix            |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/zlib/latest.nix

diff --git a/pkgs/development/libraries/zlib/latest.nix b/pkgs/development/libraries/zlib/latest.nix
new file mode 100644
index 00000000000..1333c9fdfdf
--- /dev/null
+++ b/pkgs/development/libraries/zlib/latest.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl}:
+
+# To be removed in stdenv-updates, as default.nix is already right there.
+stdenv.mkDerivation rec {
+  name = "zlib-1.2.6";
+  
+  src = fetchurl {
+    url = "http://www.zlib.net/${name}.tar.gz";
+    sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50417a72ace..d429751bffb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4845,6 +4845,9 @@ let
     fetchurl = fetchurlBoot;
   };
 
+  # To be removed in stdenv-updates; zlib is already fixed and the latest there
+  zlib_latest = callPackage ../development/libraries/zlib/latest.nix { };
+
   zlibStatic = lowPrio (appendToName "static" (import ../development/libraries/zlib {
     inherit fetchurl stdenv;
     static = true;
@@ -7633,7 +7636,11 @@ let
     inherit (xlibs) libX11;
   };
 
-  vlc = callPackage ../applications/video/vlc { };
+  vlc = callPackage ../applications/video/vlc {
+    # To be removed on stdenv-updates. It fails on i686-linux with
+    # the stdenv zlib.
+    zlib = zlib_latest;
+  };
 
   vnstat = callPackage ../applications/networking/vnstat { };