From c282368077c2f447f654c1113c3b90cb5185c1c7 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 6 Aug 2008 13:25:51 +0000 Subject: [PATCH] Some tomcat common lib fixes svn path=/nixpkgs/trunk/; revision=12510 --- pkgs/servers/http/tomcat/builder-6.0.sh | 3 ++- 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 6f3624cd20c..8b063ebfbfd 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 b02e0f49dfd..4a7248dfc8d 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