Author: urkud
Date: Sat Jan 7 20:23:35 2012
New Revision: 31422
URL: https://nixos.org/websvn/nix/?rev=31422&sc=1
Log:
xxdiff-4.0 beta (Qt4-based)
Added:
nixpkgs/trunk/pkgs/development/tools/misc/xxdiff/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/tools/misc/xxdiff/3.2.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/tools/misc/xxdiff/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/misc/xxdiff/default.nix Sat Jan
7 20:23:35 2012 (r31422)
@@ -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";
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 7 19:51:27
2012 (r31421)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 7 20:23:35
2012 (r31422)
@@ -3091,10 +3091,7 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
