From 760d6269f0ea0fb0bc9f02536f9b267c72102703 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:19:50 +0100
Subject: [PATCH 1/3] wxGTK31: use new darwin sdk pattern

---
 .../libraries/wxwidgets/wxGTK31.nix            | 18 ------------------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 19 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index 1c72e919aed5..fdc8c6703848 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -23,14 +23,6 @@
   withWebKit ? stdenv.hostPlatform.isDarwin,
   webkitgtk_4_0,
   setfile,
-  AGL,
-  Carbon,
-  Cocoa,
-  Kernel,
-  QTKit,
-  AVFoundation,
-  AVKit,
-  WebKit,
 }:
 
 stdenv.mkDerivation rec {
@@ -68,20 +60,10 @@ stdenv.mkDerivation rec {
     ++ lib.optional withCurl curl
     ++ lib.optional withMesa libGLU
     ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
-    ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       setfile
-      Carbon
-      Cocoa
-      Kernel
-      QTKit
-      AVFoundation
-      AVKit
-      WebKit
     ];
 
-  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL;
-
   configureFlags =
     [
       "--disable-precomp-headers"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ed3cf54d85b..de141175ed32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10965,7 +10965,6 @@ with pkgs;
 
   wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {
     inherit (darwin.stubs) setfile;
-    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
   };
 
   wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix {

From 90660e8d394859aa85271345017533a4b3bb3bb4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:19:58 +0100
Subject: [PATCH 2/3] wxGTK32: use new darwin sdk pattern

---
 .../libraries/wxwidgets/wxGTK32.nix            | 18 ------------------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 19 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
index 84263f4c2f4e..bf53ecc7ad59 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
@@ -25,14 +25,6 @@
 , withWebKit ? true
 , webkitgtk_4_0
 , setfile
-, AGL
-, Carbon
-, Cocoa
-, Kernel
-, QTKit
-, AVFoundation
-, AVKit
-, WebKit
 }:
 let
   catch = fetchFromGitHub {
@@ -81,21 +73,11 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional withMesa libGLU
   ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0
-  ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     expat
     setfile
-    Carbon
-    Cocoa
-    Kernel
-    QTKit
-    AVFoundation
-    AVKit
-    WebKit
   ];
 
-  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL;
-
   configureFlags = [
     "--disable-precomp-headers"
     # This is the default option, but be explicit
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de141175ed32..33e5f27c60d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10969,7 +10969,6 @@ with pkgs;
 
   wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix {
     inherit (darwin.stubs) setfile;
-    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
   };
 
   wxSVG = callPackage ../development/libraries/wxSVG {

From 3550cccc94a3c60abd05e7015eb94fdbb7cfe76f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:48:46 +0100
Subject: [PATCH 3/3] wxGTK31: fix darwin build

---
 pkgs/development/libraries/wxwidgets/wxGTK31.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index fdc8c6703848..0f0595783c3d 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -23,6 +23,7 @@
   withWebKit ? stdenv.hostPlatform.isDarwin,
   webkitgtk_4_0,
   setfile,
+  libpng,
 }:
 
 stdenv.mkDerivation rec {
@@ -62,6 +63,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       setfile
+      libpng
     ];
 
   configureFlags =