diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-08-01 09:23:10 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-08-01 09:23:10 +0000 |
| commit | 0cb6cfb7a149fbb19862895df44ffeea87e601f3 (patch) | |
| tree | c6d0ea16ebe1f49546b04e6acb8c3dfb577b0e50 /pkgs | |
| parent | 99ff06be3e18511d1e46c8833bc1a6feb99bd46f (diff) | |
* Update vlc to 1.1.11.
svn path=/nixpkgs/branches/kde-4.7/; revision=28104
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index c96dfeb013f36..ce7b233fdd208 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, xlibs, libdvdnav -, zlib, a52dec, libmad, faad2, ffmpeg, alsa +, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf , libvorbis, libtheora, speex, lua, libgcrypt, libupnp , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg @@ -10,17 +10,17 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "1.1.9"; + version = "1.1.11"; patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure''; src = fetchurl { url = "mirror://sourceforge/vlc/${name}.tar.bz2"; - sha256 = "02rdrfxh7d70yxz0qinmkw2jad2hxzfrw0r1hiyyxandrgg73ggh"; + sha256 = "1jz1yklvh5apy2ygqwnyq61mhg09h0fn32hdygxfsaxq12z609b8"; }; buildInputs = [ - perl zlib a52dec libmad faad2 ffmpeg alsa libdvdnav libdvdnav.libdvdread + perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98e4e49e65db5..88eb7873f682b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7195,8 +7195,6 @@ let }; vlc = callPackage ../applications/video/vlc { - dbus = dbus.libs; - alsa = alsaLib; lua = lua5; }; |