From 266fb8845a815785a18488401fefe21e31ca55f3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 12:19:10 +0100
Subject: [PATCH] xxdiff-tip: init at 4.0.1.20170111

Supports Qt5
---
 pkgs/development/tools/misc/xxdiff/tip.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/tools/misc/xxdiff/tip.nix

diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix
new file mode 100644
index 000000000000..b613508c5c05
--- /dev/null
+++ b/pkgs/development/tools/misc/xxdiff/tip.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromBitbucket, qt5, flex, bison, docutils }:
+
+stdenv.mkDerivation rec {
+  name = "xxdiff-4.0.1.20170101";
+
+  src = fetchFromBitbucket {
+    owner = "blais";
+    repo = "xxdiff";
+    rev = "1cf6b23ad30a845daba28a3409c65f93aec7f5e8";
+    sha256 = "0rq7grpndj85i7qzlj93jpzpfzk7bwsi55033fc63hb55rbdzz6z";
+  };
+
+  nativeBuildInputs = [ flex bison qt5.qtbase docutils ];
+
+  buildInputs = [ qt5.qtbase ];
+
+  preConfigure = ''
+    ln -s ${qt5.qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs
+    ln -s ${qt5.qtbase.dev}/bin/* ../__nix_qt*__/bin || true
+  '';
+
+  NIX_CFLAGS_COMPILE="-I${qt5.qtbase.dev}/include/QtCore -I${qt5.qtbase.dev}/include/QtGui -I${qt5.qtbase.dev}/include/QtWidgets";
+  
+  configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap";
+
+  installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
+
+
+  meta = with stdenv.lib; {
+    homepage = http://furius.ca/xxdiff/;
+    description = "Graphical file and directories comparator and merge tool";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub raskin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a79a8ccce0f4..b6476be0f5be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6909,6 +6909,7 @@ with pkgs;
   xxdiff = callPackage ../development/tools/misc/xxdiff {
     bison = bison2;
   };
+  xxdiff-tip = callPackage ../development/tools/misc/xxdiff/tip.nix { };
 
   yacc = bison;