Permalink
Browse files

xxdiff-tip: Build with qt59

  • Loading branch information...
adisbladis committed Jan 13, 2018
1 parent ed70c59 commit e2f7267ba2f89e858fc60b6033f0f85191b1ee61
Showing with 4 additions and 1 deletion.
  1. +3 −0 pkgs/development/tools/misc/xxdiff/tip.nix
  2. +1 −1 pkgs/top-level/all-packages.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
@@ -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;

0 comments on commit e2f7267

Please sign in to comment.