From c5825ffd5758f1460a523cefd07c4513e24cbc2f Mon Sep 17 00:00:00 2001 From: winston Date: Tue, 24 Mar 2026 12:16:15 +0000 Subject: [PATCH] =?UTF-8?q?gtk4:=204.20.3=20=E2=86=92=204.22.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.20.3...4.22.1 --- pkgs/by-name/gt/gtk4/package.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix index 1c4f88ccb9f5..30965a97a0fb 100644 --- a/pkgs/by-name/gt/gtk4/package.nix +++ b/pkgs/by-name/gt/gtk4/package.nix @@ -36,7 +36,6 @@ libxkbcommon, libpng, libtiff, - librsvg, libjpeg, libxml2, gnome, @@ -77,7 +76,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.20.3"; + version = "4.22.1"; outputs = [ "out" @@ -93,15 +92,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-KHPykDCIpmxxFz6i7YX/riZqZrlyw6SEK7svbxh+wVM="; + hash = "sha256-zXtanEESfab7MhxahCrXPGLmmW+c4/GWDKUJ9lWdVfw="; }; - # TODO: make it unconditional on rebuild, drop on version >= 4.20.4 - patches = lib.optional stdenv.hostPlatform.is32bit (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3b7ed49f26700c65fa9c6f41cf40d4fd5f921756.diff"; - hash = "sha256-P6cE7fnR5W+H0EWQWJ3hYSu4MwMygPIfS6e0IiXlQv8="; - }); - depsBuildBuild = [ pkg-config ]; @@ -118,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { sassc gi-docgen libxml2 # for xmllint + shared-mime-info ] ++ lib.optionals (compileSchemas && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook @@ -134,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libpng libtiff - librsvg libjpeg (libepoxy.override { inherit x11Support; }) isocodes