public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xxdiff-tip: Build with qt59

Browse Source
This commit is contained in:
adisbladis 2018-01-14 02:40:43 +08:00
parent ed70c591a4
commit e2f7267ba2
No known key found for this signature in database
GPG Key ID: ED58F95069B004F5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/misc/xxdiff/tip.nix
View File

@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
# Fixes build with Qt 5.9
NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
preConfigure = '' preConfigure = ''
cd src cd src
make -f Makefile.bootstrap make -f Makefile.bootstrap

2
pkgs/top-level/all-packages.nix
View File

@ -7962,7 +7962,7 @@ with pkgs;
xxdiff = callPackage ../development/tools/misc/xxdiff { xxdiff = callPackage ../development/tools/misc/xxdiff {
bison = bison2; bison = bison2;
}; };
xxdiff-tip = qt56.callPackage ../development/tools/misc/xxdiff/tip.nix { }; xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { };
yacc = bison; yacc = bison;