diff options
| author | Joerg Thalheim <joerg@thalheim.io> | 2017-11-21 00:21:06 +0000 |
|---|---|---|
| committer | Joerg Thalheim <joerg@thalheim.io> | 2017-11-21 00:21:06 +0000 |
| commit | 06bfed3d7fab15ec0293de39439b62682192845e (patch) | |
| tree | a1c711d3a2e8a1278b08a95b8088044e9fee7c5b /pkgs/development/tools/misc/xxdiff | |
| parent | 1af0254fc714b383f97fc4bb6f2a6b708ebb38f3 (diff) | |
xxdiff: fix build
Diffstat (limited to 'pkgs/development/tools/misc/xxdiff')
| -rw-r--r-- | pkgs/development/tools/misc/xxdiff/tip.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index f05988e702643..d3b69901ed8ab 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/; |