public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DisnixWebService: patching to use HttpTransportPropertiesImpl

Browse Source
This commit is contained in:
Marek Mahut
2019-08-10 12:52:39 +02:00
parent 0e679dd53e
commit 3633b3271d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+9 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "DisnixWebService-0.8"; name = "DisnixWebService-0.8";
@@ -11,7 +11,14 @@ stdenv.mkDerivation {
AXIS2_LIB = "${axis2}/lib"; AXIS2_LIB = "${axis2}/lib";
AXIS2_WEBAPP = "${axis2}/webapps/axis2"; AXIS2_WEBAPP = "${axis2}/webapps/axis2";
DBUS_JAVA_LIB = "${dbus_java}/share/java"; DBUS_JAVA_LIB = "${dbus_java}/share/java";
patchPhase = '' patches = [
# Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged
(fetchpatch {
url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch";
sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn";
})
];
prePatch = ''
sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
-e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
scripts/disnix-soap-client scripts/disnix-soap-client