* Fix building VLC with zlib 1.2.6.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32385

pkgs/applications/video/vlc/default.nix

@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   name = "vlc-${version}";
   version = "1.1.13";
 
-  patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure'';
-
   src = fetchurl {
     url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.bz2";
     sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83";
   };
 
+  patches = [ ./zlib.patch ];
+
   buildInputs =
     [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
       dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
       "--with-kde-solid=$out/share/apps/solid/actions"
     ];
 
+  preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure'';
+
   enableParallelBuilding = true;
 
   preBuild = ''

pkgs/applications/video/vlc/zlib.patch

@@ -0,0 +1,35 @@
+From https://401629.bugs.gentoo.org/attachment.cgi?id=300539
+Fix building VLC against zlib 1.2.6.
+
+http://bugs.gentoo.org/401629
+http://trac.videolan.org/vlc/ticket/5964
+
+--- a/modules/gui/skins2/src/theme_loader.cpp
++++ b/modules/gui/skins2/src/theme_loader.cpp
+@@ -768,7 +768,7 @@
+     {
+         void *toClose = currentGzVp;
+         currentGzVp = NULL;  currentGzFd = -1;
+-        return gzclose( toClose );
++        return gzclose( (gzFile) toClose );
+     }
+     return -1;
+ }
+@@ -777,7 +777,7 @@
+ {
+     if( currentGzVp != NULL && fd != -1 )
+     {
+-        return gzread( currentGzVp, p_buffer, i_length );
++        return gzread( (gzFile) currentGzVp, p_buffer, i_length );
+     }
+     return -1;
+ }
+@@ -786,7 +786,7 @@
+ {
+     if( currentGzVp != NULL && fd != -1 )
+     {
+-        return gzwrite( currentGzVp, const_cast<void*>(p_buffer), i_length );
++        return gzwrite( (gzFile) currentGzVp, const_cast<void*>(p_buffer), i_length );
+     }
+     return -1;
+ }