From bf4c4d7a3627c74c604e26cd6ec4a851d68d1e8f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 11:43:24 -0400
Subject: [PATCH] Revert "ffmpeg: Add optional Jack audio support."

This reverts commit fe42f8add91b1616de94f878351f3dd5b44dbcdd.
---
 pkgs/development/libraries/ffmpeg/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 53868950598..ee88fd0145c 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
-, jackSupport ? false, jackaudio ? null
 , mp3Support ? true, lame ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
@@ -13,7 +12,6 @@
 , x11grabSupport ? false, libXext ? null, libXfixes ? null
 }:
 
-assert jackSupport -> jackaudio != null;
 assert speexSupport -> speex != null;
 assert theoraSupport -> libtheora != null;
 assert vorbisSupport -> libvorbis != null;
@@ -56,7 +54,6 @@ 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