xxdiff-4.0 beta (Qt4-based)

svn path=/nixpkgs/trunk/; revision=31422
This commit is contained in:
Yury G. Kudryashov 2012-01-07 20:23:35 +00:00
parent 3b672f9b75
commit a7f52f0fd0
3 changed files with 26 additions and 46 deletions

View file

@ -1,42 +0,0 @@
args : with args;
rec {
src = fetchurl {
url = http://downloads.sourceforge.net/xxdiff/xxdiff-3.2.tar.bz2;
sha256 = "1f5j9l9n5j2ab0h3iwaz0mnz0y8h7ilc0dbcrfmaibk2njx38mcn";
};
buildInputs = [qt3 flex bison python pkgconfig makeWrapper
libX11 libXext];
configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = ["prepareMainBuild" "fixInc"
"deploy"
"installPythonPackage"
(makeManyWrappers
''$out/bin/*''
''--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH'')
];
prepareMainBuild = fullDepEntry (''
cd src
export QTDIR=${qt3}/
make -f Makefile.bootstrap makefile
'') ["minInit" "doUnpack"];
fixInc = fullDepEntry(''
sed -e '1i\#include <stdlib.h>' -i resources.inline.h
'') ["minInit" "doUnpack"];
deploy = fullDepEntry (''
ensureDir $out/bin/
cp ../bin/xxdiff $out/bin
cd ..
'') ["minInit" "doMake" "defEnsureDir" "addInputs"];
name = "xxdiff-3.2";
meta = {
description = "Interactive merge tool";
homepage = http://furius.ca/xxdiff/;
};
}

View file

@ -0,0 +1,25 @@
{ stdenv, fetchhg, qt4, flex, bison }:
stdenv.mkDerivation {
name = "xxdiff-4.0-beta1-20110723";
src = fetchhg {
name = "xxdiff";
url = https://hg.furius.ca/public/xxdiff;
sha256 = "0ahx80vdf67vq9w0g66dx39y27gvz6v1aybqj9554n6vxvg1zk5n";
};
buildNativeInputs = [ flex bison qt4 ];
buildInputs = [ qt4 ];
QMAKE = "qmake";
configurePhase =
''
cd src
make -f Makefile.bootstrap
'';
installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
}

View file

@ -3091,10 +3091,7 @@ let
valkyrie = callPackage ../development/tools/analysis/valkyrie { };
xxdiff = builderDefsPackage (import ../development/tools/misc/xxdiff/3.2.nix) {
inherit pkgconfig makeWrapper bison python flex qt3;
inherit (xlibs) libXext libX11;
};
xxdiff = callPackage ../development/tools/misc/xxdiff { };
yacc = bison;