From fe42f8add91b1616de94f878351f3dd5b44dbcdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 19 Jul 2012 04:37:33 +0200 Subject: [PATCH] ffmpeg: Add optional Jack audio support. The author of this commit is @cillianderoiste because he made the patch and I'm just committing it. This change adds support for Jack audio "while we're at it", see discussion at pull request #54. --- pkgs/development/libraries/ffmpeg/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index ee88fd0145c..53868950598 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib +, jackSupport ? false, jackaudio ? null , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -12,6 +13,7 @@ , x11grabSupport ? false, libXext ? null, libXfixes ? null }: +assert jackSupport -> jackaudio != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert vorbisSupport -> libvorbis != null; @@ -54,6 +56,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] + ++ stdenv.lib.optional jackSupport jackaudio ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora