diff options
| -rw-r--r-- | pkgs/development/tools/misc/xxdiff/tip.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index d3b69901ed8..844758c0f06 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 988cf446a00..4463b5b77d4 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; |