From dd90ec0d929c4a6f5dad6e14a7e66e4213066cfd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2012 10:32:02 +0000
Subject: [PATCH] wxGTK-2.x: enable support for media control

svn path=/nixpkgs/trunk/; revision=31516
---
 pkgs/development/libraries/wxGTK-2.8/default.nix | 4 +++-
 pkgs/development/libraries/wxGTK-2.9/2.9.0.nix   | 4 +++-
 pkgs/development/libraries/wxGTK-2.9/2.9.1.nix   | 4 +++-
 pkgs/top-level/all-packages.nix                  | 6 ++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index 8f87aa89b96..824c3587655 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
+, gstreamer, gstPluginsBase, GConf
 , mesa, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ];
 
   buildNativeInputs = [ pkgconfig ];
 
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
     "--disable-precomp-headers"
     (if unicode then "--enable-unicode" else "")
     "--with-opengl"
+    "--enable-mediactrl"
   ];
 
   # This variable is used by configure to find some dependencies.
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
index ca1d8212cac..1a614fada90 100644
--- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
+, gstreamer, gstPluginsBase, GConf
 , mesa, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ];
 
   buildNativeInputs = [ pkgconfig ];
 
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
     "--disable-precomp-headers"
     (if unicode then "--enable-unicode" else "")
     "--with-opengl"
+    "--enable-mediactrl"
   ];
 
   SEARCH_LIB = "${mesa}/lib";
diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
index 7fa571704c3..c1056bb9ef1 100644
--- a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
+, gstreamer, gstPluginsBase, GConf
 , mesa, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ];
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ];
 
   buildNativeInputs = [ pkgconfig ];
 
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
     "--disable-precomp-headers"
     (if unicode then "--enable-unicode" else "")
     "--with-opengl"
+    "--enable-mediactrl"
   ];
 
   SEARCH_LIB = "${mesa}/lib";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9777f7cbfcd..f10723cf026 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4684,14 +4684,20 @@ let
 
   wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
     inherit (gtkLibs) gtk;
+    inherit (gst_all) gstreamer gstPluginsBase;
+    inherit (gnome) GConf;
   };
 
   wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
     inherit (gtkLibs) gtk;
+    inherit (gst_all) gstreamer gstPluginsBase;
+    inherit (gnome) GConf;
   };
 
   wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
     inherit (gtkLibs) gtk;
+    inherit (gst_all) gstreamer gstPluginsBase;
+    inherit (gnome) GConf;
   };
 
   wtk = callPackage ../development/libraries/wtk { };