From 848f583ba3bf9c2d38fb97f0a695294641104111 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Feb 2012 15:42:59 +0000
Subject: [PATCH] * VLC: build with xcb-util-keysyms instead of xcb-util,
 otherwise the   keyboard doesn't work properly.  (xcb-util-keysyms was split
 from   xcb-util.)

svn path=/nixpkgs/trunk/; revision=32300
---
 pkgs/applications/video/vlc/default.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 8e11dd6068d..02000ffeb21 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -19,20 +19,23 @@ stdenv.mkDerivation rec {
     sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83";
   };
 
-  buildInputs = [
-    perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
-    dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
-    libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
-    udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
-    libkate libtiger libv4l samba liboggz libass libdvbpsi
-  ]
-  ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]);
+  buildInputs =
+    [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
+      dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
+      libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
+      udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
+      libkate libtiger libv4l samba liboggz libass libdvbpsi libva
+      xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
+    ];
 
   buildNativeInputs = [ pkgconfig ];
 
-  configureFlags = [ "--enable-alsa"
-    "--with-kde-solid=$out/share/apps/solid/actions"
-  ];
+  configureFlags =
+    [ "--enable-alsa"
+      "--with-kde-solid=$out/share/apps/solid/actions"
+    ];
+
+  enableParallelBuilding = true;
 
   preBuild = ''
     substituteInPlace modules/misc/freetype.c --replace \