From 11200746852ab36c23e850234ef66c90d1c9a9ac Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 22 May 2023 12:08:36 +0800 Subject: [PATCH] gtk4: Backport fixes to fix regression in nautilus, mutter These patches are backported in Fedora 38. --- pkgs/development/libraries/gtk/4.x.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index f801f83c989..be2c5d64843 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -2,6 +2,7 @@ , stdenv , substituteAll , fetchurl +, fetchpatch2 , pkg-config , gettext , graphene @@ -82,6 +83,20 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 ./patches/4.0-fix-darwin-build.patch + + # Fix deleting in Nautilus (part of 4.10.4) + # https://gitlab.gnome.org/GNOME/nautilus/-/issues/2945 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/4f47683710bbb4b56c286c6ee6a5c394fcf2b755.patch"; + sha256 = "fU9SX8MH37ZN6Ffk/YhYmipTC7+uT9JXnWggArWNkqA="; + }) + # Fix border/artifact appearing in applications (part of 4.10.4) + # https://gitlab.gnome.org/GNOME/mutter/-/issues/2805 + # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6696 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/b686ce1cb62dba505120e0f1116c516662a06e30.patch"; + sha256 = "0zjY5s+T4CVe3WiowgWE58ruVvqBFUuY2juwBOzMRN4="; + }) ]; depsBuildBuild = [