From bb8ac70291bd7a936bcac1db1ff898de4e964289 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 11:43:30 -0400
Subject: [PATCH] Revert "ffmpeg: Add option to enable x11grab support."

This reverts commit 05831d3a668361b2948c0185eceb6d7c579c851a.
---
 pkgs/development/libraries/ffmpeg/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 41768c4e313..9b90d56d4d9 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -9,7 +9,6 @@
 , vdpauSupport ? true, libvdpau ? null
 , faacSupport ? false, faac ? null
 , dc1394Support ? false, libdc1394 ? null
-, x11grabSupport ? false, libXext ? null, libXfixes ? null
 }:
 
 assert speexSupport -> speex != null;
@@ -20,7 +19,6 @@ assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
 assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
-assert x11grabSupport -> libXext != null && libXfixes != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-0.11.1";
@@ -50,8 +48,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
     ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
     ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
-    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
-    ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
+    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394";
 
   buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
     ++ stdenv.lib.optional mp3Support lame
@@ -63,8 +60,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional vdpauSupport libvdpau
     ++ stdenv.lib.optional faacSupport faac
-    ++ stdenv.lib.optional dc1394Support libdc1394
-    ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
+    ++ stdenv.lib.optional dc1394Support libdc1394;
 
   enableParallelBuilding = true;