about summary refs log tree commit diff
path: root/pkgs/tools/text/kdiff3
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-03-19 12:16:21 +0100
committerMichael Raskin <7c6f434c@mail.ru>2017-03-19 12:16:32 +0100
commit8565047bdd85a893d9bc840674d920eab90bbbfd (patch)
tree011800fa6a5564c11671985bfc30ea6f06d78eea /pkgs/tools/text/kdiff3
parente16c5a82549bf63abddad34bfb7d577654ba46ae (diff)
downloadnixlib-8565047bdd85a893d9bc840674d920eab90bbbfd.tar
nixlib-8565047bdd85a893d9bc840674d920eab90bbbfd.tar.gz
nixlib-8565047bdd85a893d9bc840674d920eab90bbbfd.tar.bz2
nixlib-8565047bdd85a893d9bc840674d920eab90bbbfd.tar.lz
nixlib-8565047bdd85a893d9bc840674d920eab90bbbfd.tar.xz
nixlib-8565047bdd85a893d9bc840674d920eab90bbbfd.tar.zst
nixlib-8565047bdd85a893d9bc840674d920eab90bbbfd.zip
kdiff3: fix build
Diffstat (limited to 'pkgs/tools/text/kdiff3')
-rw-r--r--pkgs/tools/text/kdiff3/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index b53d619d837c..a35e09cfcda1 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -16,7 +16,11 @@ let
       inherit rev;
     };
 
-    preConfigure = "cd kdiff3";
+    setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
+
+    postPatch = ''
+      sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
+    '';
 
     nativeBuildInputs = [ extra-cmake-modules kdoctools ];