From ee2f1269d0734cafb182dc90e2848e138855e698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 21 Feb 2022 23:29:36 +0100 Subject: [PATCH] wxwidgets: remove darwin from inputs --- .../libraries/wxwidgets/wxGTK29.nix | 11 +++++----- .../libraries/wxwidgets/wxGTK30.nix | 9 ++++++--- .../libraries/wxwidgets/wxGTK31.nix | 9 ++++++--- .../libraries/wxwidgets/wxmac30.nix | 12 ++++++----- pkgs/top-level/all-packages.nix | 20 +++++++++++++++---- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK29.nix b/pkgs/development/libraries/wxwidgets/wxGTK29.nix index 87ad752125e4..47724fe537d4 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK29.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK29.nix @@ -14,13 +14,14 @@ , compat26 ? true , unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, darwin +, setfile +, AGL +, Carbon +, Cocoa +, Kernel +, QuickTime }: -let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; -in stdenv.mkDerivation rec { pname = "wxGTK"; version = "2.9.5"; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 5b15d189a13d..9395dd7eb362 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -17,14 +17,17 @@ , unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk -, darwin +, setfile +, AGL +, Carbon +, Cocoa +, Kernel +, QTKit }: assert withGtk2 -> (!withWebKit); let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (gst_all_1) gstreamer gst-plugins-base; gtk = if withGtk2 then gtk2 else gtk3; in diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 6e84b6deffec..b0d3b4184702 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -20,14 +20,17 @@ , withGtk2 ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withWebKit ? false, webkitgtk -, darwin +, setfile +, AGL +, Carbon +, Cocoa +, Kernel +, QTKit }: assert withGtk2 -> (!withWebKit); let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (gnome2) GConf; inherit (gst_all_1) gst-plugins-base gstreamer; gtk = if withGtk2 then gtk2 else gtk3; diff --git a/pkgs/development/libraries/wxwidgets/wxmac30.nix b/pkgs/development/libraries/wxwidgets/wxmac30.nix index e1f732929cec..73bf013452a5 100644 --- a/pkgs/development/libraries/wxwidgets/wxmac30.nix +++ b/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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f9cacb5025f..a6ee1c3df611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20509,10 +20509,22 @@ with pkgs; wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { }; - wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { }; - wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { }; - wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { }; + wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; + }; + wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; + wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; + wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { + inherit (darwin.stubs) derez rez setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel WebKit; + }; wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; };