Merge pull request #41441 from volth/patch-132

znapzend: fix build
This commit is contained in:
xeji 2018-06-05 08:59:56 +02:00 committed by GitHub
commit 4edbee64a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,23 @@
{ stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
{ stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
let
# when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES
Mojolicious-6-46 = perlPackages.buildPerlPackage rec {
name = "Mojolicious-6.46";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr";
};
};
MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec {
name = "Mojo-IOLoop-ForkCall-0.17";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz";
sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8";
};
propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ];
};
version = "0.18.0";
checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd";
in
@ -14,9 +31,7 @@ stdenv.mkDerivation rec {
sha256 = checksum;
};
buildInputs = [ perl perlPackages.TestHarness perlPackages.Mojolicious
perlPackages.TAPParserSourceHandlerpgTAP perlPackages.MojoIOLoopForkCall
perlPackages.IOPipely wget ];
buildInputs = [ wget perl perlPackages.TestHarness MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ];
nativeBuildInputs = [ autoconf automake ];
@ -38,25 +53,25 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \
"${perl}/bin/perl \
-I${perlPackages.TestHarness}/${perl.libPrefix} \
-I${perlPackages.Mojolicious}/${perl.libPrefix} \
-I${Mojolicious-6-46}/${perl.libPrefix} \
-I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
-I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \
-I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \
-I${perlPackages.IOPipely}/${perl.libPrefix} \
"
substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \
"${perl}/bin/perl \
-I${perlPackages.TestHarness}/${perl.libPrefix} \
-I${perlPackages.Mojolicious}/${perl.libPrefix} \
-I${Mojolicious-6-46}/${perl.libPrefix} \
-I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
-I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \
-I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \
-I${perlPackages.IOPipely}/${perl.libPrefix} \
"
substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \
"${perl}/bin/perl \
-I${perlPackages.TestHarness}/${perl.libPrefix} \
-I${perlPackages.Mojolicious}/${perl.libPrefix} \
-I${Mojolicious-6-46}/${perl.libPrefix} \
-I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
-I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \
-I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \
-I${perlPackages.IOPipely}/${perl.libPrefix} \
"
'';