From d21e4dda7c7018dfe1f4624079e6ad819ab23255 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Tue, 4 Jan 2022 01:30:01 +0200 Subject: gtk3: fix darwin build 3.24.31 does not declare QuartzCore dependency properly and fails to link --- pkgs/development/libraries/gtk/3.x.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs/development/libraries/gtk/3.x.nix') diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 02443619b26..9a2655a379f 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -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 -- cgit 1.4.1