From 6d4d42f6ee6220bcc4bc87707da8abdbe140808e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 29 Sep 2023 16:22:00 +0000 Subject: [PATCH] =?UTF-8?q?gtk4:=204.12.2=20=E2=86=92=204.12.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.12.2...4.12.3 NEWS and meson changes look okay. Changelog-reviewed-by: Bobby Rong Changelog-reviewed-by: Jan Tojnar --- pkgs/development/libraries/gtk/4.x.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 5f2301ca0e81..218efb6559fb 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -3,6 +3,7 @@ , buildPackages , substituteAll , fetchurl +, fetchpatch , pkg-config , gettext , graphene @@ -68,7 +69,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.12.2"; + version = "4.12.3"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -80,12 +81,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "L09NT5LgnyFtOGz9rdVNM9l/I6RVXWe5fez6b4Fba4E="; + sha256 = "FIziYvbIZIdFX7HZeTw/WLw+HaR3opYX+tsEIPWHCok="; }; patches = [ # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 ./patches/4.0-fix-darwin-build.patch + + # gdk: Fix compilation on macos + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/aa888c0b3f775776fe3b71028396b7a8c6adb1d6.patch"; + sha256 = "sha256-Jw6BvWDX0wIs4blUiX3qdQCR574yhcaO06Vy/IqfbJo="; + }) ]; depsBuildBuild = [