summary refs log tree commit diff
path: root/pkgs/applications/video/vlc/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/video/vlc/default.nix')
-rw-r--r--pkgs/applications/video/vlc/default.nix18
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 471a4c4a76f7..8e11dd6068d6 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"
   ];