Merge pull request #269328 from anthonyroussel/bugfix/disnix-web-service
DisnixWebService: fix build for Axis2 1.8.1
This commit is contained in:
commit
6909e461de
1 changed files with 19 additions and 4 deletions
|
@ -1,12 +1,25 @@
|
|||
{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
|
||||
{lib, stdenv, fetchFromGitHub, fetchpatch, apacheAnt, jdk, axis2, dbus_java }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "DisnixWebService";
|
||||
version = "0.10.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-${version}/DisnixWebService-${version}.tar.gz";
|
||||
sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svanderburg";
|
||||
repo = "DisnixWebService";
|
||||
rev = "refs/tags/DisnixWebService-${version}";
|
||||
hash = "sha256-zcYr2Ytx4pevSthTQLpnQ330wDxN9dWsZA20jbO6PxQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Correct the DisnixWebService build for compatibility with Axis2 1.8.1
|
||||
# See https://github.com/svanderburg/DisnixWebService/pull/2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/svanderburg/DisnixWebService/commit/cee99c6af744b5dda16728a70ebd2800f61871a0.patch";
|
||||
hash = "sha256-4rSEN8AwivUXUCIUYFBRIoE19jVDv+Vpgakmy8fR06A=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ apacheAnt jdk ];
|
||||
PREFIX = "\${env.out}";
|
||||
AXIS2_LIB = "${axis2}/lib";
|
||||
|
@ -22,6 +35,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "A SOAP interface and client for Disnix";
|
||||
homepage = "https://github.com/svanderburg/DisnixWebService";
|
||||
changelog = "https://github.com/svanderburg/DisnixWebService/blob/DisnixWebService-${version}/NEWS.txt";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
Loading…
Reference in a new issue