diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2008-08-06 13:25:51 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2008-08-06 13:25:51 +0000 |
| commit | c282368077c2f447f654c1113c3b90cb5185c1c7 (patch) | |
| tree | 6f3fad958dec11e09548d62315777327a9f8d042 /pkgs/servers | |
| parent | 7608d6f063d034b4f9c3ed3ee6813d0f0472df24 (diff) | |
Some tomcat common lib fixes
svn path=/nixpkgs/trunk/; revision=12510
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/tomcat/builder-6.0.sh | 3 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/jdbc/mysql/builder.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh index 6f3624cd20cc3..8b063ebfbfd3f 100644 --- a/pkgs/servers/http/tomcat/builder-6.0.sh +++ b/pkgs/servers/http/tomcat/builder-6.0.sh @@ -4,4 +4,5 @@ tar zxf $src mkdir $out mv apache-tomcat*/* $out -sed -i -e 's|shared.loader=|shared.loader=${catalina.base}/shared/lib/*.jar|' $out/conf/catalina.properties +sed -i -e 's|${catalina.home}|${catalina.base}|g' \ + -e 's|shared.loader=|shared.loader=${catalina.base}/shared/lib/*.jar|' $out/conf/catalina.properties diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh index b02e0f49dfdef..4a7248dfc8d50 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh +++ b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh @@ -1,4 +1,4 @@ source $stdenv/setup -ensureDir $out/shared/lib -ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/shared/lib/mysql-connector-java.jar +ensureDir $out/lib +ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar |