diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-02-21 23:29:36 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-02-21 23:29:36 +0100 |
| commit | ee2f1269d0734cafb182dc90e2848e138855e698 (patch) | |
| tree | 4e8d0133aef6b62334555aad084364eee232ce39 /pkgs/development/libraries/wxwidgets | |
| parent | a5eb7d85c83ba9e965daa8eca1fd420d835c7cfb (diff) | |
| download | nixlib-ee2f1269d0734cafb182dc90e2848e138855e698.tar nixlib-ee2f1269d0734cafb182dc90e2848e138855e698.tar.gz nixlib-ee2f1269d0734cafb182dc90e2848e138855e698.tar.bz2 nixlib-ee2f1269d0734cafb182dc90e2848e138855e698.tar.lz nixlib-ee2f1269d0734cafb182dc90e2848e138855e698.tar.xz nixlib-ee2f1269d0734cafb182dc90e2848e138855e698.tar.zst nixlib-ee2f1269d0734cafb182dc90e2848e138855e698.zip | |
wxwidgets: remove darwin from inputs
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/wxGTK29.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/wxGTK30.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/wxGTK31.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/wxmac30.nix | 12 |
4 files changed, 25 insertions, 16 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"; |