Author: eelco
Date: Wed Feb 15 15:42:59 2012
New Revision: 32300
URL: https://nixos.org/websvn/nix/?rev=32300&sc=1
Log:
* 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.)
Modified:
nixpkgs/trunk/pkgs/applications/video/vlc/default.nix
Modified: nixpkgs/trunk/pkgs/applications/video/vlc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/vlc/default.nix Wed Feb 15
15:39:12 2012 (r32299)
+++ nixpkgs/trunk/pkgs/applications/video/vlc/default.nix Wed Feb 15
15:42:59 2012 (r32300)
@@ -19,20 +19,23 @@
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 \
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
