summary refs log tree commit diff
path: root/pkgs/applications/version-management/meld/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/version-management/meld/default.nix')
-rw-r--r--pkgs/applications/version-management/meld/default.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index bef284ea534..462744641e3 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchurl
+, fetchpatch
 , gettext
 , itstool
 , python3
@@ -27,6 +28,16 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI=";
   };
 
+  patches = [
+    # Pull upstream fix for meson-0.60:
+    #  https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78
+    (fetchpatch {
+      name = "meson-0.60.patch";
+      url  = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch";
+      sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja