Author: urkud
Date: Thu Jan 26 08:36:18 2012
New Revision: 31843
URL: https://nixos.org/websvn/nix/?rev=31843&sc=1
Log:
vlc-1.1.13
Modified:
nixpkgs/trunk/pkgs/applications/video/vlc/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/video/vlc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/vlc/default.nix Thu Jan 26
02:08:48 2012 (r31842)
+++ nixpkgs/trunk/pkgs/applications/video/vlc/default.nix Thu Jan 26
08:36:18 2012 (r31843)
@@ -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"
];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jan 26 02:08:48
2012 (r31842)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jan 26 08:36:18
2012 (r31843)
@@ -7660,9 +7660,7 @@
inherit (xlibs) libX11;
};
- vlc = callPackage ../applications/video/vlc {
- lua = lua5;
- };
+ vlc = callPackage ../applications/video/vlc { };
vnstat = callPackage ../applications/networking/vnstat { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
