public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tomcat uses j2sdk after all (at build time)

Browse Source 
svn path=/nixpkgs/trunk/; revision=1302
This commit is contained in:
Eelco Visser 2004-08-20 14:22:27 +00:00
parent 778dab85be
commit dd3c98d3ec
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/servers/http/tomcat/builder.sh
View File

@ -1,5 +1,20 @@
. $stdenv/setup || exit 1 . $stdenv/setup || exit 1
tar zxf $src 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 mkdir $out
mv jakarta-tomcat* $out mv jakarta-tomcat* $out

3
pkgs/servers/http/tomcat/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl}: {stdenv, fetchurl, j2sdk}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,6 +11,7 @@ stdenv.mkDerivation {
md5 = "b802ee042677e284bcf65738c7bdc3b6"; md5 = "b802ee042677e284bcf65738c7bdc3b6";
}; };
sdk = j2sdk;
} }

2
pkgs/system/all-packages-generic.nix
View File

@ -390,7 +390,7 @@ rec {
# }; # };
tomcat5 = (import ../servers/http/tomcat) { tomcat5 = (import ../servers/http/tomcat) {
inherit fetchurl stdenv; inherit fetchurl stdenv j2sdk;
}; };
pcre = (import ../development/libraries/pcre) { pcre = (import ../development/libraries/pcre) {