kdiff3: fix with git mergetool (#25059)

The quick patch has been submitted upstream. (cherry picked from commit be7ce1b) I consider that problem a regression wrt. 16.09.
NixOS · Apr 20, 2017 · c558d09 · c558d09
1 parent 5d611ad
commit c558d09
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, lib, fetchgit,
+  kdeDerivation, kdeWrapper, lib, fetchgit, fetchpatch,
   extra-cmake-modules, kdoctools, kconfig, kinit, kparts
 }:
 
@@ -16,6 +16,14 @@ let
       inherit rev;
     };
 
+    patches = [
+      (fetchpatch {
+        name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
+        url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
+        sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
+      })
+    ];
+
     preConfigure = "cd kdiff3";
 
     nativeBuildInputs = [ extra-cmake-modules kdoctools ];