diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
commit | 5b132f6e96a9794018ae1c085da482b381d1e039 (patch) | |
tree | ff54ae514799540c093adcfeca0d501b75cde506 /pkgs/applications/video/vlc | |
parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/applications/video/vlc')
-rw-r--r-- | pkgs/applications/video/vlc/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 471a4c4a76f71..8e11dd6068d67 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, xlibs, libdvdnav , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib -, pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf -, libvorbis, libtheora, speex, lua, libgcrypt, libupnp +, pkgconfig, dbus, fribidi, qt4, freefont_ttf +, 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 @@ -10,29 +10,27 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "1.1.11"; + version = "1.1.13"; patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure''; src = fetchurl { - url = "mirror://sourceforge/vlc/${name}.tar.bz2"; - sha256 = "1jz1yklvh5apy2ygqwnyq61mhg09h0fn32hdygxfsaxq12z609b8"; + url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.bz2"; + sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83"; }; buildInputs = [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread - pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt + 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 ]); + buildNativeInputs = [ pkgconfig ]; + configureFlags = [ "--enable-alsa" - "--disable-glx" - "--disable-remoteosd" - "--disable-dbus" - "--disable-dbus-control" "--with-kde-solid=$out/share/apps/solid/actions" ]; |