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] 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 {