* 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
This commit is contained in:
Eelco Dolstra 2012-02-15 15:42:59 +00:00
parent c29e492417
commit 848f583ba3

View File

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