From 8ac53703f03a4f11ab1e3cd1cd9b9461bc9560a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Mar 2009 23:28:06 +0000
Subject: [PATCH] * vlc: use faad.

svn path=/nixpkgs/trunk/; revision=14502
---
 pkgs/applications/video/vlc/default.nix | 7 +++----
 pkgs/top-level/all-packages.nix         | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 0e0b4ece07a4..e1b2d5d7eeff 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, 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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2582d326ffc7..45937ec15732 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;