about summary refs log tree commit diff
path: root/pkgs/by-name/tk/tkdiff/package.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/by-name/tk/tkdiff/package.nix')
-rw-r--r--pkgs/by-name/tk/tkdiff/package.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/by-name/tk/tkdiff/package.nix b/pkgs/by-name/tk/tkdiff/package.nix
index 478ee4e29ff9..329b7144202e 100644
--- a/pkgs/by-name/tk/tkdiff/package.nix
+++ b/pkgs/by-name/tk/tkdiff/package.nix
@@ -9,9 +9,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk=";
   };
 
-  # fix regression: allow /dev/null again. eg: "tkdiff /dev/null file"
-  # svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk
-  patches = [ ./189.patch ];
+  patches = [
+    # fix regression: allow /dev/null again. eg: "tkdiff /dev/null file"
+    # svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk
+    ./189.patch
+
+    # fix regression: trigger redraw when inline recursive diff requested
+    # svn diff --git -r193:194 https://svn.code.sf.net/p/tkdiff/code/trunk | \
+    #   sed -e '/^@@ -4545,7/,14d' -e '/^@@ -18063,7/,$d'
+    ./194.patch
+  ];
 
   nativeBuildInputs = [ makeBinaryWrapper ];