summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-08-10 12:52:39 +0200
committerMarek Mahut <marek.mahut@gmail.com>2019-08-10 12:52:39 +0200
commit3633b3271dfc644acc63b062feb4f95e88054c42 (patch)
treeec8810ef5fd6672d51d5b1b8a203d0e4bbb45948 /pkgs/tools/package-management
parent0e679dd53e1aa60e61dc25db5e0a0ea882bb7416 (diff)
DisnixWebService: patching to use HttpTransportPropertiesImpl
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/disnix/DisnixWebService/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index f75bf6bf1625..3299ab8b63b6 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
+{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }:
stdenv.mkDerivation {
name = "DisnixWebService-0.8";
@@ -11,7 +11,14 @@ stdenv.mkDerivation {
AXIS2_LIB = "${axis2}/lib";
AXIS2_WEBAPP = "${axis2}/webapps/axis2";
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}|" \
-e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
scripts/disnix-soap-client