public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* ffmpeg: Add zlib and bzip2 to the build inputs to enable a few more 

codecs.

svn path=/nixpkgs/branches/kde-4.7/; revision=27945
This commit is contained in:
Eelco Dolstra 2011-07-25 14:46:04 +00:00
parent 4c2a6992d3
commit fca12d0cf6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg/default.nix
View File

@ -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