1 files changed, 36 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/xxdiff/tip.nix b/nixpkgs/pkgs/development/tools/misc/xxdiff/tip.nix
new file mode 100644
index 000000000000..1424b8fe1974
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/misc/xxdiff/tip.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }:
+
+stdenv.mkDerivation rec {
+  name = "xxdiff-5.0b1";
+
+  src = fetchFromBitbucket {
+    owner = "blais";
+    repo = "xxdiff";
+    rev = "5e5f885dfc43559549a81c59e9e8c9525306356a";
+    sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w";
+  };
+
+  nativeBuildInputs = [ flex bison docutils ];
+
+  buildInputs = [ qtbase ];
+
+  # Fixes build with Qt 5.9
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
+  preConfigure = ''
+    cd src
+    make -f Makefile.bootstrap
+  '';
+
+  postInstall = ''
+    install -D ../bin/xxdiff $out/bin/xxdiff
+  '';
+
+  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 ];
+  };
+}