* ffmpeg: build with faad2 support. However, vlc still won't play

  mp4a audio.
* faad2: latest version.
* vlc: fix the hard-coded OSD font path name.  Dunno why they don't
  use fontconfig.

svn path=/nixpkgs/trunk/; revision=14501

1 files changed, 9 insertions, 3 deletions

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 7e51cf94f1c..0e0b4ece07a 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, xlibs, libdvdnav
-, zlib, mpeg2dec, a52dec, libmad, ffmpeg, alsa
-, pkgconfig, dbus, hal, fribidi, qt4
+, zlib, a52dec, libmad, ffmpeg, alsa
+, pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +17,13 @@ stdenv.mkDerivation {
     pkgconfig dbus hal fribidi qt4
   ];
 
-  configureFlags = "--enable-alsa --disable-glx --disable-remoteosd";
+  configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad";
+
+  preBuild = ''
+    substituteInPlace modules/misc/freetype.c --replace \
+      /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \
+      ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
+  '';
 
   meta = {
     description = "Cross-platform media player and streaming server";