Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

5 files changed, 14 insertions, 17 deletions

diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK28.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK28.nix
index 19a57d68e15b..b577e5248203 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK28.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK28.nix
@@ -17,8 +17,6 @@
 , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 }:
 
-assert withMesa -> libGLU != null && libGL != null;
-
 stdenv.mkDerivation rec {
   pname = "wxGTK";
   version = "2.8.12.1";
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK29.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK29.nix
index d5bef77202f1..097cce6109cb 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK29.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK29.nix
@@ -22,7 +22,6 @@
 , setfile
 }:
 
-assert withMesa -> libGLU != null && libGL != null;
 stdenv.mkDerivation rec {
   pname = "wxGTK";
   version = "2.9.5";
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK30.nix
index 115453303870..82005a12dd2f 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK30.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK30.nix
@@ -18,6 +18,7 @@
 , withGtk2 ? true
 , withWebKit ? false, webkitgtk
 , AGL
+, AVFoundation
 , Carbon
 , Cocoa
 , Kernel
@@ -28,7 +29,6 @@
 assert withGtk2 -> (!withWebKit);
 
 let
-  inherit (gst_all_1) gstreamer gst-plugins-base;
   gtk = if withGtk2 then gtk2 else gtk3;
 in
 stdenv.mkDerivation rec {
@@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gstreamer
-    gst-plugins-base
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
     gtk
     libSM
     libXinerama
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional withMesa libGLU
   ++ lib.optional withWebKit webkitgtk
   ++ lib.optionals stdenv.isDarwin [
+    AVFoundation
     Carbon
     Cocoa
     Kernel
@@ -131,7 +132,6 @@ stdenv.mkDerivation rec {
     license = licenses.wxWindows;
     maintainers = with maintainers; [ ];
     platforms = platforms.linux ++ platforms.darwin;
-    badPlatforms = [ "x86_64-darwin" ];
   };
 
   passthru = {
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index 31d59e24fd84..5bce6250c74f 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -35,8 +35,6 @@
 assert withGtk2 -> (!withWebKit);
 
 let
-  inherit (gnome2) GConf;
-  inherit (gst_all_1) gst-plugins-base gstreamer;
   gtk = if withGtk2 then gtk2 else gtk3;
 in
 stdenv.mkDerivation rec {
@@ -59,8 +57,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    gst-plugins-base
-    gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
   ]
   ++ lib.optionals (!stdenv.isDarwin) [
     gtk
@@ -71,7 +69,7 @@ stdenv.mkDerivation rec {
     xorgproto
   ]
   ++ lib.optionals withGtk2 [
-    GConf
+    gnome2.GConf
   ]
   ++ lib.optional withMesa libGLU
   ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxmac30.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxmac30.nix
index e1f732929cec..73bf013452a5 100644
--- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxmac30.nix
+++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxmac30.nix
@@ -7,13 +7,15 @@
 , libpng
 , libtiff
 , zlib
-, darwin
+, AGL
+, Cocoa
+, Kernel
+, WebKit
+, derez
+, rez
+, setfile
 }:
 
-let
-  inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;
-  inherit (darwin.stubs) derez rez setfile;
-in
 stdenv.mkDerivation rec {
   pname = "wxmac";
   version = "3.0.5.1";