Skip to content
Permalink
Browse files

kdiff3: 2017-02-19 -> 2017-06-11

  • Loading branch information
peterhoeg committed Jul 13, 2017
1 parent 47868cb commit 7babf5f9aeb9cee28ac2ccd84b40dbca6d8e05d6
Showing with 12 additions and 24 deletions.
  1. +12 −24 pkgs/tools/text/kdiff3/default.nix
@@ -1,34 +1,22 @@
{
mkDerivation, lib, fetchgit, fetchpatch,
extra-cmake-modules, kdoctools, wrapGAppsHook,
kcrash, kconfig, kinit, kparts
{ mkDerivation, lib, fetchFromGitLab
, extra-cmake-modules, kdoctools, wrapGAppsHook
, kcrash, kconfig, kinit, kparts
}:

mkDerivation rec {
name = "kdiff3-${version}";
version = "1.7.0-2017-02-19";
version = "1.7.0-2017-06-11";

src = fetchgit {
# gitlab is outdated
url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git;
sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8";
rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f";
src = fetchFromGitLab {
owner = "tfischer";
repo = "kdiff3";
rev = "346496678771b8fbed1cb003d909417e1f7a43f6";
sha256 = "05a2l1yyzh6dfm0xgp6mzjfbnj0jssmwqfa5092p3gvp7lmq3vbs";
};

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
'';
# postPatch = ''
# sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
# '';

nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];

0 comments on commit 7babf5f

Please sign in to comment.
You can’t perform that action at this time.