From e2f7267ba2f89e858fc60b6033f0f85191b1ee61 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 14 Jan 2018 02:40:43 +0800
Subject: [PATCH] xxdiff-tip: Build with qt59

---
 pkgs/development/tools/misc/xxdiff/tip.nix | 3 +++
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix
index d3b69901ed8a..844758c0f065 100644
--- a/pkgs/development/tools/misc/xxdiff/tip.nix
+++ b/pkgs/development/tools/misc/xxdiff/tip.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase ];
 
+  # Fixes build with Qt 5.9
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
   preConfigure = ''
     cd src
     make -f Makefile.bootstrap
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 988cf446a00e..4463b5b77d4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7962,7 +7962,7 @@ with pkgs;
   xxdiff = callPackage ../development/tools/misc/xxdiff {
     bison = bison2;
   };
-  xxdiff-tip = qt56.callPackage ../development/tools/misc/xxdiff/tip.nix { };
+  xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { };
 
   yacc = bison;