diff options
-rw-r--r-- | pkgs/applications/editors/kile/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/disnix/DisnixService/builder.sh | 15 | ||||
-rw-r--r-- | pkgs/tools/package-management/disnix/DisnixService/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/security/seccure/0.3.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
5 files changed, 25 insertions, 9 deletions
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 385f1c7dce4b..1f8f73f3b74a 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, arts, qt, kdelibs, libX11, libXt, libXext, zlib, libpng, libjpeg, freetype, expat }: +{stdenv, fetchurl, perl, arts, qt, kdelibs, libX11, libXt, libXext, libXrender, libXft, zlib, libpng, libjpeg, freetype, expat }: stdenv.mkDerivation { name = "kile-2.0"; @@ -8,5 +8,5 @@ stdenv.mkDerivation { sha256 = "14a7e4605a3ee486b9a7c11e9bd3236bdbd34955d5522eac5da1e511dea6c7e2"; }; - buildInputs = [ perl arts qt kdelibs libX11 libXt libXext zlib libpng libjpeg freetype expat ]; + buildInputs = [ perl arts qt kdelibs libX11 libXt libXext libXrender libXft zlib libpng libjpeg freetype expat ]; } 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; diff --git a/pkgs/tools/security/seccure/0.3.nix b/pkgs/tools/security/seccure/0.3.nix index a42837cf60d9..0ddff073ad6d 100644 --- a/pkgs/tools/security/seccure/0.3.nix +++ b/pkgs/tools/security/seccure/0.3.nix @@ -2,7 +2,8 @@ args : with args; with builderDefs {src="";} null; let localDefs = builderDefs (rec { src = /* put a fetchurl here */ fetchurl { - url = http://freshmeat.net/redir/seccure/65485/url_tgz/seccure-0.3.tar.gz; +# url = http://freshmeat.net/redir/seccure/65485/url_tgz/seccure-0.3.tar.gz; + url = http://ftp.ussg.iu.edu/FreeBSD/distfiles/seccure-0.3.tar.gz; sha256 = "0isah96p35yxm86dklmgmdkvpflqi2aj4k344jp57chrhg5av74d"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9b73035a7ed..3ce9451ad3ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6209,7 +6209,7 @@ let pkgs = rec { kile = import ../applications/editors/kile { inherit stdenv fetchurl perl arts kdelibs zlib libpng libjpeg freetype expat; - inherit (xlibs) libX11 libXt libXext libXrender; + inherit (xlibs) libX11 libXt libXext libXrender libXft; qt = qt3; }; @@ -7264,7 +7264,7 @@ let pkgs = rec { }; DisnixService = import ../tools/package-management/disnix/DisnixService { - inherit stdenv fetchsvn apacheAnt jdk axis2; + inherit stdenv fetchsvn apacheAnt jdk axis2 shebangfix; }; ntfs3g = import ../misc/ntfs-3g { |