dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #153412 from mikroskeem/darwin-fix-gtk3

Browse Source 
gtk3: fix darwin build
This commit is contained in:
Jan Tojnar 2022-01-04 11:16:05 +01:00 committed by GitHub
commit d551b7a06b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/gtk/3.x.nix
View File

@ -44,6 +44,7 @@
, cups
, AppKit
, Cocoa
, QuartzCore
, broadwaySupport ? true
}:
@ -83,6 +84,12 @@ stdenv.mkDerivation rec {
# e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
# https://gitlab.gnome.org/GNOME/gtk/merge_requests/536
./patches/3.0-darwin-x11.patch
# 3.24.31 does not declare QuartzCore dependency properly and fails to link
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/0ac61443694b477c41fc246cb387ef86aba441de.patch";
sha256 = "sha256-aiT/NeAxIl6ZS9KwMssQPzD7NtW7qqeySc/CyWakQfk=";
})
];
nativeBuildInputs = [
@ -133,6 +140,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [
# explicitly propagated, always needed
Cocoa
QuartzCore
] ++ lib.optionals waylandSupport [
libGL
wayland

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

@ -16968,7 +16968,7 @@ with pkgs;
gtkextra = callPackage ../development/libraries/gtkextra { };
gtk3 = callPackage ../development/libraries/gtk/3.x.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa QuartzCore;
};
gtk4 = callPackage ../development/libraries/gtk/4.x.nix {