summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-05-02 17:29:09 +0200
committerJan Tojnar <jtojnar@gmail.com>2022-05-06 00:48:25 +0200
commit1e7cc37ca46b7e6daa477f8ccdd460797a5182d9 (patch)
tree82844774ab69c080e60757d959a34ef600892c4c
parent1cc16e71e1760309a9ef686ca2d4ce1a53913ce5 (diff)
downloadnixpkgs-1e7cc37ca46b7e6daa477f8ccdd460797a5182d9.tar
nixpkgs-1e7cc37ca46b7e6daa477f8ccdd460797a5182d9.tar.gz
nixpkgs-1e7cc37ca46b7e6daa477f8ccdd460797a5182d9.tar.bz2
nixpkgs-1e7cc37ca46b7e6daa477f8ccdd460797a5182d9.tar.lz
nixpkgs-1e7cc37ca46b7e6daa477f8ccdd460797a5182d9.tar.xz
nixpkgs-1e7cc37ca46b7e6daa477f8ccdd460797a5182d9.tar.zst
nixpkgs-1e7cc37ca46b7e6daa477f8ccdd460797a5182d9.zip
meld: Fix view not rendering with adwaita-icon-theme 42 due to removed icons
-rw-r--r--pkgs/applications/version-management/meld/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 462744641e3..f8f58cdcaba 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -36,6 +36,13 @@ python3.pkgs.buildPythonApplication rec {
       url  = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch";
       sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ=";
     })
+
+    # Fix view not rendering with adwaita-icon-theme 42 due to removed icons.
+    # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83
+    (fetchpatch {
+      url  = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch";
+      sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE=";
+    })
   ];
 
   nativeBuildInputs = [