Author: rob
Date: Wed Oct 20 08:23:52 2010
New Revision: 24376
URL: https://svn.nixos.org/websvn/nix/?rev=24376&sc=1
Log:
antBuild: minor changes
Modified:
nixpkgs/trunk/pkgs/build-support/release/ant-build.nix
nixpkgs/trunk/pkgs/build-support/release/default.nix
Modified: nixpkgs/trunk/pkgs/build-support/release/ant-build.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/release/ant-build.nix Wed Oct 20
05:44:22 2010 (r24375)
+++ nixpkgs/trunk/pkgs/build-support/release/ant-build.nix Wed Oct 20
08:23:52 2010 (r24376)
@@ -1,5 +1,6 @@
{ src
-, stdenv
+, pkgs
+, stdenv ? pkgs.stdenv
, name
, antTargets ? []
, jars ? []
@@ -7,6 +8,9 @@
, antProperties ? []
, antBuildInputs ? []
, buildfile ? "build.xml"
+, ant ? pkgs.ant
+, jre ? pkgs.jre
+, hydraAntLogger ? pkgs.hydraAntLogger
, ... } @ args:
let
@@ -79,11 +83,13 @@
'';
}
- // removeAttrs args ["antProperties"] //
+ // removeAttrs args ["antProperties" "buildInputs" "pkgs"] //
{
name = name + (if src ? version then "-" + src.version else "");
+ buildInputs = [ant jre] ++ stdenv.lib.optional (args ? buildInputs)
args.buildInputs ;
+
postHook = ''
ensureDir $out/nix-support
echo "$system" > $out/nix-support/system
Modified: nixpkgs/trunk/pkgs/build-support/release/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/release/default.nix Wed Oct 20
05:44:22 2010 (r24375)
+++ nixpkgs/trunk/pkgs/build-support/release/default.nix Wed Oct 20
08:23:52 2010 (r24376)
@@ -15,7 +15,7 @@
} // args);
antBuild = args: import ./ant-build.nix (
- { inherit stdenv;
+ { inherit pkgs;
} // args);
mvnBuild = args: import ./maven-build.nix (
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
