From 5a7fa1d061fc6bf4abbb89a15a70a7c819167526 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 20 Oct 2010 08:23:52 +0000
Subject: [PATCH] antBuild: minor changes

svn path=/nixpkgs/trunk/; revision=24376
---
 pkgs/build-support/release/ant-build.nix | 10 ++++++++--
 pkgs/build-support/release/default.nix   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
index 4c8d5fbac75..f6882de54d0 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@@ -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 @@ stdenv.mkDerivation (
       '';
   }
 
-  // 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
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index b7a362aa9f9..2cf2b1f8d6d 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -15,7 +15,7 @@ rec {
     } // args);
 
   antBuild = args: import ./ant-build.nix (
-    { inherit stdenv;
+    { inherit pkgs;
     } // args);
 
   mvnBuild = args: import ./maven-build.nix (