public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25059 from vcunat/p/kdiff3-git-mergetool 

kdiff3: fix with git mergetool
This commit is contained in:
Michael Raskin 2017-04-20 16:55:15 +02:00 committed by GitHub
parent d15f26ec69 be7ce1b0e9
commit 38933324a6
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 extra-cmake-modules, kdoctools, kconfig, kinit, kparts
}: }:
@ -18,6 +18,15 @@ let
setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"''; 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 = '' postPatch = ''
sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
''; '';
@ -26,6 +35,8 @@ let
propagatedBuildInputs = [ kconfig kinit kparts ]; propagatedBuildInputs = [ kconfig kinit kparts ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
homepage = http://kdiff3.sourceforge.net/; homepage = http://kdiff3.sourceforge.net/;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;