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

xxdiff-tip: 20170101 -> 20170623

Browse Source 
Updates the xxdiff-tip version and fixes compilation errors by forcing qt5.6.
This commit is contained in:
Bastian Köcher 2017-08-28 22:14:11 +02:00
parent 39cf16f10e
commit 0da61beee9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,25 +1,25 @@
{ stdenv, fetchFromBitbucket, qt5, flex, bison, docutils }: { stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xxdiff-4.0.1.20170101"; name = "xxdiff-4.0.1.20170623";
src = fetchFromBitbucket { src = fetchFromBitbucket {
owner = "blais"; owner = "blais";
repo = "xxdiff"; repo = "xxdiff";
rev = "1cf6b23ad30a845daba28a3409c65f93aec7f5e8"; rev = "5e5f885dfc43559549a81c59e9e8c9525306356a";
sha256 = "0rq7grpndj85i7qzlj93jpzpfzk7bwsi55033fc63hb55rbdzz6z"; sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w";
}; };
nativeBuildInputs = [ flex bison qt5.qtbase docutils ]; nativeBuildInputs = [ flex bison docutils ];
buildInputs = [ qt5.qtbase ]; buildInputs = [ qtbase ];
preConfigure = '' preConfigure = ''
ln -s ${qt5.qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs ln -s ${qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs
ln -s ${qt5.qtbase.dev}/bin/* ../__nix_qt*__/bin || true ln -s ${qtbase.dev}/bin/* ../__nix_qt*__/bin || true
''; '';
NIX_CFLAGS_COMPILE="-I${qt5.qtbase.dev}/include/QtCore -I${qt5.qtbase.dev}/include/QtGui -I${qt5.qtbase.dev}/include/QtWidgets"; NIX_CFLAGS_COMPILE="-I${qtbase.dev}/include/QtCore -I${qtbase.dev}/include/QtGui -I${qtbase.dev}/include/QtWidgets";
configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap"; configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap";

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

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