From fca12d0cf674e0d10f29a8de423b68058270cad8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Jul 2011 14:46:04 +0000 Subject: [PATCH] * ffmpeg: Add zlib and bzip2 to the build inputs to enable a few more codecs. svn path=/nixpkgs/branches/kde-4.7/; revision=27945 --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index f4c86d67716..5138bb12581 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2 , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - buildInputs = [ pkgconfig lame yasm ] + buildInputs = [ pkgconfig lame yasm zlib bzip2 ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora