From 06bfed3d7fab15ec0293de39439b62682192845e Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 21 Nov 2017 00:21:06 +0000 Subject: [PATCH] xxdiff: fix build --- pkgs/development/tools/misc/xxdiff/tip.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index f05988e70264..d3b69901ed8a 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -15,16 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; preConfigure = '' - ln -s ${qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs - ln -s ${qtbase.dev}/bin/* ../__nix_qt*__/bin || true + cd src + make -f Makefile.bootstrap ''; - 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"; - - installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin"; - + postInstall = '' + install -D ../bin/xxdiff $out/bin/xxdiff + ''; meta = with stdenv.lib; { homepage = http://furius.ca/xxdiff/;