* Fixes for a52dec and mpeg2dec to make vlc build on x86_64-linux.

* Fixes to make par2cmdline and exult build on gcc 4.x, since gcc
  3.4.x doesn't seem to work on x86_64-linux (NIXPKGS-91).
* Disabled pidgin on x86_64-linux because it needs a dynamic libperl
  which we don't have right now.
* Disabled wine on x86_64-linux because we still lack -m32 support.

svn path=/nixpkgs/trunk/; revision=12187

1 files changed, 4 insertions, 5 deletions

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 0d499008b0ce..b774cd28b62c 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -8,11 +8,11 @@ assert libdvdread.libdvdcss == libdvdcss;
 assert xvSupport -> libXv != null;
 
 stdenv.mkDerivation {
-  name = "vlc-0.8.6d";
+  name = "vlc-0.8.6h";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/0.8.6d/vlc-0.8.6d.tar.bz2;
-    sha256 = "019jw9cp7fbmhbmlbwvjgpamxwx0rdajyxab2sbmh4n6v04fl266";
+    url = http://download.videolan.org/pub/videolan/vlc/0.8.6h/vlc-0.8.6h.tar.bz2;
+    sha256 = "08bj6ndxj0f7jdsif43535qyavpy13wni93z7c2790i2d748gvah";
   };
 
   buildInputs = [
@@ -20,8 +20,7 @@ stdenv.mkDerivation {
     zlib mpeg2dec a52dec libmad ffmpeg alsa
     libdvdread # <- for "simple" DVD playback
     libdvdnav libdvdcss # <- for DVD playback with menus
-    (if xvSupport then libXv else null)
-  ];
+  ] ++ stdenv.lib.optional xvSupport libXv;
 
   # Ensure that libdvdcss will be found without having to set LD_LIBRARY_PATH.
   NIX_LDFLAGS = "-ldvdcss";