mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity

kdiff3: fix with git mergetool

Browse source 
The quick patch has been submitted upstream.
This commit is contained in:
Vladimír Čunát 2017-04-20 14:48:40 +02:00
parent 91ad6b3597
commit be7ce1b0e9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/tools/text/kdiff3/default.nix
View file

@ -1,5 +1,5 @@
{
kdeDerivation, kdeWrapper, lib, fetchgit,
kdeDerivation, kdeWrapper, lib, fetchgit, fetchpatch,
extra-cmake-modules, kdoctools, kconfig, kinit, kparts
}:
@ -18,6 +18,15 @@ let
setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
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";
})
];
patchFlags = "-p 2";
postPatch = ''
sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
'';
@ -26,6 +35,8 @@ let
propagatedBuildInputs = [ kconfig kinit kparts ];
enableParallelBuilding = true;
meta = with lib; {
homepage = http://kdiff3.sourceforge.net/;
license = licenses.gpl2Plus;