Some fixes

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

2 files changed, 19 insertions, 4 deletions

diff --git a/pkgs/tools/package-management/disnix/DisnixService/builder.sh b/pkgs/tools/package-management/disnix/DisnixService/builder.sh
index 44b6405dca4d..b73a8f622cad 100644
--- a/pkgs/tools/package-management/disnix/DisnixService/builder.sh
+++ b/pkgs/tools/package-management/disnix/DisnixService/builder.sh
@@ -1,5 +1,6 @@
 source $stdenv/setup
 
+# Fix permissions
 cp -av $src/* .
 find . -type f | while read i
 do
@@ -9,7 +10,10 @@ find . -type d | while read i
 do
     chmod 755 "$i"
 done
+
 export AXIS2_LIB=$axis2/share/java/axis2
+
+# Deploy webservice
 ant generate.library.jar
 ant generate.service.aar
 ensureDir $out/shared/lib
@@ -17,3 +21,14 @@ cp *.jar *.so $out/shared/lib
 chmod 755 $out/shared/lib/*.so
 ensureDir $out/webapps/axis2/WEB-INF/services
 cp DisnixService.aar $out/webapps/axis2/WEB-INF/services
+
+# Deploy client
+ant generate.client.jar
+ensureDir $out/bin
+for i in disnix-soap-*
+do
+    sed -i -e "s|AXIS2_LIBDIR=|AXIS2_LIBDIR=$axis2/share/java/axis2|" $i
+    shebangfix $i
+done
+cp disnix-soap-* DisnixClient.jar jargs.jar $out/bin
+chmod 755 $out/bin/disnix-soap-*
diff --git a/pkgs/tools/package-management/disnix/DisnixService/default.nix b/pkgs/tools/package-management/disnix/DisnixService/default.nix
index 4ba56d878ab1..0eaa525e22c9 100644
--- a/pkgs/tools/package-management/disnix/DisnixService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixService/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchsvn, jdk, apacheAnt, axis2}:
+{stdenv, fetchsvn, jdk, apacheAnt, axis2, shebangfix}:
 
 stdenv.mkDerivation {
     name = "DisnixService-0.1";
     src = fetchsvn {
 	url = https://svn.nixos.org/repos/nix/disnix/DisnixService/trunk;
-	md5 = "f1a5cc28b8a0f92a084111241c35045d";
-	rev = 12354;
+	md5 = "d58d2f313b9b6c18648f1a54a113d86a";
+	rev = 12449;
     };
     
-    buildInputs = [ jdk apacheAnt axis2 ];
+    buildInputs = [ jdk apacheAnt axis2 shebangfix ];
     builder = ./builder.sh;
     inherit axis2;