summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/servers/http/tomcat/axis2/builder.sh8
-rw-r--r--pkgs/servers/http/tomcat/axis2/default.nix6
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh
index fa58a9e5292..91d300822a7 100644
--- a/pkgs/servers/http/tomcat/axis2/builder.sh
+++ b/pkgs/servers/http/tomcat/axis2/builder.sh
@@ -1,14 +1,14 @@
-buildInputs="$unzip $apacheAnt $jdk"
 source $stdenv/setup
 
 unzip $src
 cd axis2-*
-ensureDir $out/share/java/axis2
-cp lib/* $out/share/java/axis2
+ensureDir $out
+cp -av * $out
 cd webapp
 ant
+cd ..
 ensureDir $out/webapps
-cp ../dist/axis2.war $out/webapps
+cp dist/axis2.war $out/webapps
 cd $out/webapps
 mkdir axis2
 cd axis2
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index 6e0cad66e49..c3529524575 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,15 +1,13 @@
 {stdenv, fetchurl, apacheAnt, jdk, unzip}:
 
 stdenv.mkDerivation {
-
   name = "axis2-1.5";
 
-  builder = ./builder.sh;
-
   src = fetchurl {
     url = http://apache.mirror.easycolocate.nl/ws/axis2/1_5/axis2-1.5-bin.zip;
     sha256 = "0f0a471xfsjx7s3i9awhajl1kli8y8pd8aiki7cwb9n4g467rwmc";
   };
 
-  inherit apacheAnt jdk unzip;
+  buildInputs = [ unzip apacheAnt jdk ];
+  builder = ./builder.sh;
 }