git.iko.soy/typeable/nixpkgs
on master help sign in
DisnixWebService: patching to use HttpTransportPropertiesImpl
commit3633b3271dfc644acc63b062feb4f95e88054c42 authorMarek Mahut <marek.mahut@gmail.com> dateSat 10 Aug 2019, 12:52 (7 years ago) parent0e679dd
1 file changed+9−2
pkgs/tools/package-management/disnix/DisnixWebService/default.nix+9−2
pkgs/tools/package-management/disnix/DisnixWebService/default.nix+9−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
1+{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }:
22
33stdenv.mkDerivation {
44 name = "DisnixWebService-0.8";
@@ -11,7 +11,14 @@ stdenv.mkDerivation {
1111 AXIS2_LIB = "${axis2}/lib";
1212 AXIS2_WEBAPP = "${axis2}/webapps/axis2";
1313 DBUS_JAVA_LIB = "${dbus_java}/share/java";
14− patchPhase = ''
14+ patches = [
15+ # Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged
16+ (fetchpatch {
17+ url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch";
18+ sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn";
19+ })
20+ ];
21+ prePatch = ''
1522 sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
1623 -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
1724 scripts/disnix-soap-client