summary refs log tree commit diff
path: root/pkgs/development/libraries/faac
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/faac
parent166e5a8fbf9acd0c9c86b3dfe9ebcff23c3c28eb (diff)
* 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/faac')
-rw-r--r--pkgs/development/libraries/faac/default.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index f133217b202a3..732b591353c89 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchurl, autoconf, automake, libtool }:
+{ stdenv, fetchurl, mp4v2 }:
 
-stdenv.mkDerivation {
-  name = "faac-1.26";
+stdenv.mkDerivation rec {
+  name = "faac-1.28";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/faac/faac-1.26.tar.gz;
-    sha256 = "0ld9d8mn3yp90japzkqkicmjcggi7d8y9gn7cl1jdsb74bif4j2b";
+    url = "http://downloads.sourceforge.net/faac/${name}.tar.gz";
+    sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565";
   };
 
-  preConfigure = "./bootstrap";
-
-  buildInputs = [ autoconf automake libtool ];
+  buildInputs = [ mp4v2 ];
 
   meta = {
     description = "Open source MPEG-4 and MPEG-2 AAC encoder";