diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-06-29 12:41:25 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-06-29 12:41:25 +0000 |
commit | d97fa85adf35642c6119123d4f8c1919ea2cbd1f (patch) | |
tree | a3c0e3a67fedf365a0bd2002720801bcd42ac84b /pkgs/applications/video | |
parent | a96763545d29ad4b97209566034c817f3e848c0c (diff) | |
download | nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.gz nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.bz2 nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.lz nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.xz nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.zst nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.zip |
* Some VLC-related updates.
* Variability :-) Provide both Autoconf 2.59 and 2.60 (the former being the default for now). svn path=/nixpkgs/trunk/; revision=5539
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/vlc/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b926d1295f89..de455639e628 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,23 +1,25 @@ { xvSupport ? true -, stdenv, fetchurl, x11, libXv, wxGTK, libdvdcss, libdvdplay -, mpeg2dec, a52dec, libmad, alsa}: +, stdenv, fetchurl, perl, x11, libXv, wxGTK +#libdvdcss, libdvdplay +, zlib, mpeg2dec, a52dec, libmad, ffmpeg, alsa +}: -assert libdvdplay.libdvdread.libdvdcss == libdvdcss; +#assert libdvdplay.libdvdread.libdvdcss == libdvdcss; assert xvSupport -> libXv != null; stdenv.mkDerivation { name = "vlc-0.8.5"; src = fetchurl { - url = http://ftp.snt.utwente.nl/pub/software/videolan/vlc/0.8.5/vlc-0.8.5.tar.gz; - md5 = "90d19a5ba2ef2e03e6062fadc2e810d2"; + url = http://ftp.snt.utwente.nl/pub/software/videolan/vlc/0.8.5/vlc-0.8.5.tar.bz2; + md5 = "16bb5bf87ed94879a8eb7b0ff9b4f16f"; }; buildInputs = [ - x11 wxGTK libdvdcss libdvdplay libdvdplay.libdvdread - mpeg2dec a52dec libmad alsa + perl x11 wxGTK /* libdvdcss libdvdplay libdvdplay.libdvdread */ + zlib mpeg2dec a52dec libmad ffmpeg alsa (if xvSupport then libXv else null) ]; - configureFlags = "--disable-ffmpeg --enable-alsa"; + configureFlags = "--enable-alsa"; } |