gtk4: fix x64 darwin

use 10.15 sdk to fix build
NixOS · Oct 24, 2024 · dc564ca · dc564ca
1 parent e80a134
commit dc564ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
@@ -50,11 +50,11 @@
 , cupsSupport ? stdenv.hostPlatform.isLinux
 , compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages
 , cups
-, AppKit
-, Cocoa
 , libexecinfo
 , broadwaySupport ? true
 , testers
+, apple-sdk
+, apple-sdk_10_15
 }:
 
 let
@@ -131,8 +131,9 @@ stdenv.mkDerivation (finalAttrs: {
     libXi
     libXrandr
     libXrender
-  ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    AppKit
+  ]) ++ lib.optionals (stdenv.hostPlatform.isDarwin
+                    && lib.versionOlder apple-sdk.version "10.15") [
+    apple-sdk_10_15
   ] ++ lib.optionals trackerSupport [
     tinysparql
   ] ++ lib.optionals waylandSupport [
@@ -143,8 +144,6 @@ stdenv.mkDerivation (finalAttrs: {
     xorg.libXinerama
   ] ++ lib.optionals cupsSupport [
     cups
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Cocoa
   ] ++ lib.optionals stdenv.hostPlatform.isMusl [
     libexecinfo
   ];

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -20052,9 +20052,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa QuartzCore;
   };
 
-  gtk4 = callPackage ../development/libraries/gtk/4.x.nix {
-    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
-  };
+  gtk4 = callPackage ../development/libraries/gtk/4.x.nix { };
 
 
   # On darwin gtk uses cocoa by default instead of x11.