diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-05-22 16:02:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-22 16:02:22 +0800 |
| commit | c538b5fc56c57211ba49525bec288c1593284c7b (patch) | |
| tree | 0f95cf8e22d5c062cd1f178dd9bfa166dc72c943 /pkgs | |
| parent | 9c6ea01e02a3c2d40368d58313f8cd73241bf4f5 (diff) | |
| parent | 11200746852ab36c23e850234ef66c90d1c9a9ac (diff) | |
Merge pull request #233345 from bobby285271/bpo/gtk4
gtk4: Backport fixes to fix regression in nautilus, mutter
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gtk/4.x.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index f801f83c9895e..be2c5d64843e8 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 = [ |