summary refs log tree commit diff
path: root/pkgs/development/libraries/mp4v2
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-05-12 20:43:33 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-05-12 20:43:33 +0000
commit03055c53007ed8c4964636f18b2fa3083ca558f5 (patch)
treeeff52a2c537c840439501e403bcdff4fa9f2012e /pkgs/development/libraries/mp4v2
parent166e5a8fbf9acd0c9c86b3dfe9ebcff23c3c28eb (diff)
downloadnixpkgs-03055c53007ed8c4964636f18b2fa3083ca558f5.tar
nixpkgs-03055c53007ed8c4964636f18b2fa3083ca558f5.tar.gz
nixpkgs-03055c53007ed8c4964636f18b2fa3083ca558f5.tar.bz2
nixpkgs-03055c53007ed8c4964636f18b2fa3083ca558f5.tar.lz
nixpkgs-03055c53007ed8c4964636f18b2fa3083ca558f5.tar.xz
nixpkgs-03055c53007ed8c4964636f18b2fa3083ca558f5.tar.zst
nixpkgs-03055c53007ed8c4964636f18b2fa3083ca558f5.zip
* Updated ffmpeg, faac and xvidcore.
* ffmpeg: enable support for faac (disabled by default because faac is
  non-free).
* faac: use an external mp4v2 because the internal one doesn't build.

svn path=/nixpkgs/trunk/; revision=27240
Diffstat (limited to 'pkgs/development/libraries/mp4v2')
-rw-r--r--pkgs/development/libraries/mp4v2/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index d681713f516..7b0dd938211 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, help2man }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mp4v2-1.9.1";
 
-  buildInputs = [ help2man ];
   src = fetchurl {
     url = "http://mp4v2.googlecode.com/files/${name}.tar.bz2";
     sha256 = "1d73qbi0faqad3bpmjfr4kk0mfmqpl1f43ysrx4gq9i3mfp1qf2w";
   };
 
+  # `faac' expects `mp4.h'.
+  postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";
+
   meta = {
     homepage = http://code.google.com/p/mp4v2;
     maintainers = [ stdenv.lib.maintainers.urkud ];