From 8565047bdd85a893d9bc840674d920eab90bbbfd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 19 Mar 2017 12:16:21 +0100 Subject: [PATCH] kdiff3: fix build --- pkgs/tools/text/kdiff3/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index b53d619d837..a35e09cfcda 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 ];