dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* vlc: use faad.

Browse Source 
svn path=/nixpkgs/trunk/; revision=14502
This commit is contained in:
Eelco Dolstra 2009-03-10 23:28:06 +00:00
parent 1485c905f7
commit 8ac53703f0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/vlc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, xlibs, libdvdnav { stdenv, fetchurl, perl, xlibs, libdvdnav
, zlib, a52dec, libmad, ffmpeg, alsa , zlib, a52dec, libmad, faad2, ffmpeg, alsa
, pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
}: }:
@ -12,9 +12,8 @@ stdenv.mkDerivation {
}; };
buildInputs = [ buildInputs = [
perl xlibs.xlibs xlibs.libXv zlib a52dec libmad ffmpeg alsa perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg
libdvdnav libdvdnav.libdvdread alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4
pkgconfig dbus hal fribidi qt4
]; ];
configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad"; configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad";

2
pkgs/top-level/all-packages.nix
View File

@ -8750,7 +8750,7 @@ let
virtualbox = virtualboxFun null;*/ virtualbox = virtualboxFun null;*/
vlc = import ../applications/video/vlc { vlc = import ../applications/video/vlc {
inherit fetchurl stdenv perl xlibs zlib a52dec libmad inherit fetchurl stdenv perl xlibs zlib a52dec libmad faad2
ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf; ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf;
dbus = dbus.libs; dbus = dbus.libs;
alsa = alsaLib; alsa = alsaLib;