From b7304edb3f9ef82474796438599471e375b40f2a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 24 Feb 2022 13:08:08 -0300 Subject: [PATCH] wxwidgets: remove darwin from inputs --- .../libraries/wxwidgets/2.8/default.nix | 2 +- .../libraries/wxwidgets/2.9/default.nix | 15 ++++++++------- .../libraries/wxwidgets/3.0/default.nix | 13 ++++++++----- ...0001-fix-assertion-using-hide-in-destroy.patch | 0 pkgs/top-level/all-packages.nix | 10 ++++++++-- 5 files changed, 25 insertions(+), 15 deletions(-) rename pkgs/development/libraries/wxwidgets/{ => patches}/0001-fix-assertion-using-hide-in-destroy.patch (100%) 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 similarity index 100% rename from pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch rename to pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c8b6885688..28ed00b8144a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20502,20 +20502,26 @@ with pkgs; wxformbuilder = callPackage ../development/tools/wxformbuilder { }; wxGTK = wxGTK28; - wxGTK30 = wxGTK30-gtk2; wxGTK31 = wxGTK31-gtk2; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { }; + wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; + }; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = false; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {