tomcat uses j2sdk after all (at build time)

svn path=/nixpkgs/trunk/; revision=1302

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

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;
 }
 
 

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) {