nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-27 14:34:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

gtk4: fix x64 darwin (#351004)

Browse Source
This commit is contained in:
Emily 2024-10-24 21:31:47 +01:00 committed by GitHub
commit 17b2fbb690
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/gtk/4.x.nix
View File

@ -50,11 +50,12 @@
, cupsSupport ? stdenv.hostPlatform.isLinux
, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages
, cups
, AppKit
, Cocoa
, libexecinfo
, broadwaySupport ? true
, testers
, apple-sdk
, apple-sdk_10_15
, darwinMinVersionHook
}:
let
@ -131,9 +132,7 @@ stdenv.mkDerivation (finalAttrs: {
libXi
libXrandr
libXrender
]) ++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
] ++ lib.optionals trackerSupport [
]) ++ lib.optionals trackerSupport [
tinysparql
] ++ lib.optionals waylandSupport [
libGL
@ -143,8 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libXinerama
] ++ lib.optionals cupsSupport [
cups
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
] ++ lib.optionals stdenv.hostPlatform.isMusl [
libexecinfo
];
@ -165,6 +162,11 @@ stdenv.mkDerivation (finalAttrs: {
# Required for GSettings schemas at runtime.
# Will be picked up by wrapGAppsHook4.
gsettings-desktop-schemas
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
(darwinMinVersionHook "15.0")
] ++ lib.optionals (stdenv.hostPlatform.isDarwin
&& lib.versionOlder apple-sdk.version "10.15") [
apple-sdk_10_15
];
mesonFlags = [

4
pkgs/top-level/all-packages.nix
View File

@ -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.