diff options
author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-24 13:08:08 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-24 13:13:19 -0300 |
commit | b7304edb3f9ef82474796438599471e375b40f2a (patch) | |
tree | 92c1602e32503474795af92e0343c7e9c94c428e /pkgs/development/libraries/wxwidgets | |
parent | 211ec209b1814ddd38e53743cd721e200acab626 (diff) | |
download | nixlib-b7304edb3f9ef82474796438599471e375b40f2a.tar nixlib-b7304edb3f9ef82474796438599471e375b40f2a.tar.gz nixlib-b7304edb3f9ef82474796438599471e375b40f2a.tar.bz2 nixlib-b7304edb3f9ef82474796438599471e375b40f2a.tar.lz nixlib-b7304edb3f9ef82474796438599471e375b40f2a.tar.xz nixlib-b7304edb3f9ef82474796438599471e375b40f2a.tar.zst nixlib-b7304edb3f9ef82474796438599471e375b40f2a.zip |
wxwidgets: remove darwin from inputs
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
-rw-r--r-- | pkgs/development/libraries/wxwidgets/2.8/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/wxwidgets/2.9/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch (renamed from pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch) | 0 |
4 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index bc8fc6f5b047..19a57d68e15b 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 46ef04dcb7a1..34d76e53ff67 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -14,14 +14,15 @@ , compat26 ? true , unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, darwin +, AGL +, Carbon +, Cocoa +, Kernel +, QuickTime +, setfile }: assert withMesa -> libGLU != null && libGL != null; -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"; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ../0001-fix-assertion-using-hide-in-destroy.patch + ../patches/0001-fix-assertion-using-hide-in-destroy.patch ]; nativeBuildInputs = [ @@ -115,7 +116,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.darwin ++ platforms.linux; badPlatforms = [ "x86_64-darwin" ]; }; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 0469ccbd0dfb..628d8bd02377 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -17,14 +17,17 @@ , unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk -, darwin +, AGL +, Carbon +, Cocoa +, Kernel +, QTKit +, setfile }: 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 @@ -66,7 +69,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ../0001-fix-assertion-using-hide-in-destroy.patch + ../patches/0001-fix-assertion-using-hide-in-destroy.patch ]; configureFlags = [ @@ -126,7 +129,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; badPlatforms = [ "x86_64-darwin" ]; }; diff --git a/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch b/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch index ca9eb8bf612a..ca9eb8bf612a 100644 --- a/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch +++ b/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch |