From 05259ed6352343c9afe4aa3731a4042fdec99ed6 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 27 Jul 2009 16:05:39 +0000
Subject: [PATCH] Monetdb: enabling Java support

svn path=/nixpkgs/trunk/; revision=16479
---
 pkgs/servers/sql/monetdb/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix      | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 5f4ac6fd6b1a..398f7beb541e 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -10,13 +10,18 @@ composableDerivation {} {
       sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj";
     };
 
-    flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; };
+    flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }
+            // {
+              java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; };
+              /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
+            };
 
     buildInputs = [ (pcre.override { unicodeSupport = true; })
                      openssl readline libxml2]; # optional python perl php java ?
 
     cfg = {
       geomSupport = true;
+      javaSupport = true;
     };
 
     configurePhase = ":";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7dbcaef0cf8..cd047643131d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4482,8 +4482,8 @@ let
   };
 
   monetdb = import ../servers/sql/monetdb {
-    inherit composableDerivation;
-    inherit fetchurl stdenv pcre openssl readline libxml2 geos;
+    inherit composableDerivation getConfig;
+    inherit fetchurl stdenv pcre openssl readline libxml2 geos apacheAnt jdk5;
   };
 
   mysql4 = import ../servers/sql/mysql {