From dd3c98d3ecf73eb3e9c4648d3d0109fd072a0f89 Mon Sep 17 00:00:00 2001
From: Eelco Visser <visser@acm.org>
Date: Fri, 20 Aug 2004 14:22:27 +0000
Subject: [PATCH] tomcat uses j2sdk after all (at build time)

svn path=/nixpkgs/trunk/; revision=1302
---
 pkgs/servers/http/tomcat/builder.sh  | 15 +++++++++++++++
 pkgs/servers/http/tomcat/default.nix |  3 ++-
 pkgs/system/all-packages-generic.nix |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/builder.sh b/pkgs/servers/http/tomcat/builder.sh
index 4678a878e416..1a2414d5970d 100644
--- a/pkgs/servers/http/tomcat/builder.sh
+++ b/pkgs/servers/http/tomcat/builder.sh
@@ -1,5 +1,20 @@
 . $stdenv/setup || exit 1
 
 tar zxf $src
+cd jakarta-tomcat*/bin
+
+# install jsvc
+
+tar xvfz jsvc.tar.gz
+cd jsvc-src
+sh ./configure --with-java=$sdk
+make
+cp jsvc ..
+cd ..
+
+# done jsvc
+
+cd ../..
+
 mkdir $out
 mv jakarta-tomcat* $out
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index cd61afb2d345..4ea86930bc8c 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, j2sdk}:
 
 stdenv.mkDerivation {
 
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
     md5 = "b802ee042677e284bcf65738c7bdc3b6";
   };
 
+  sdk = j2sdk;
 }
 
 
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 386e40e96db7..ba7ea5a4fcda 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -390,7 +390,7 @@ rec {
 #  };
 
   tomcat5 = (import ../servers/http/tomcat) {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv j2sdk;
   };
 
   pcre = (import ../development/libraries/pcre) {