mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
* vlc: use faad.
svn path=/nixpkgs/trunk/; revision=14502
This commit is contained in:
parent
1485c905f7
commit
8ac53703f0
2 changed files with 4 additions and 5 deletions
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, perl, xlibs, libdvdnav
|
||||
, zlib, a52dec, libmad, ffmpeg, alsa
|
||||
, zlib, a52dec, libmad, faad2, ffmpeg, alsa
|
||||
, pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
|
||||
}:
|
||||
|
||||
|
@ -12,9 +12,8 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
buildInputs = [
|
||||
perl xlibs.xlibs xlibs.libXv zlib a52dec libmad ffmpeg alsa
|
||||
libdvdnav libdvdnav.libdvdread
|
||||
pkgconfig dbus hal fribidi qt4
|
||||
perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg
|
||||
alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4
|
||||
];
|
||||
|
||||
configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad";
|
||||
|
|
|
@ -8750,7 +8750,7 @@ let
|
|||
virtualbox = virtualboxFun null;*/
|
||||
|
||||
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;
|
||||
dbus = dbus.libs;
|
||||
alsa = alsaLib;
|
||||
|
|
Loading…
Reference in a new issue