diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:45:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:45:54 +0200 |
commit | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (patch) | |
tree | 6eabee7471ed3f7395156dc158a58205cca236f4 /pkgs/tools/package-management/disnix/DisnixWebService/default.nix | |
parent | 9bd78cb0488040ea996b27e82135396a45325af5 (diff) | |
parent | 930659b10bc7c875fd49b1cdae21a631b429c25a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management/disnix/DisnixWebService/default.nix')
-rw-r--r-- | pkgs/tools/package-management/disnix/DisnixWebService/default.nix | 11 |
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 f75bf6bf16255..3299ab8b63b67 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 |