Merge pull request #66564 from jonringer/fix-varnish

varnish5: fix build
This commit is contained in:
Jörg Thalheim 2019-08-17 14:11:29 +01:00 committed by GitHub
commit 2baf41b0d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 16 deletions

View file

@ -1,8 +1,8 @@
{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
, python3, makeWrapper }: , python2, python3, makeWrapper }:
let let
common = { version, sha256, extraBuildInputs ? [] }: common = { version, sha256, python, extraNativeBuildInputs ? [] }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "varnish-${version}"; name = "varnish-${version}";
@ -11,11 +11,12 @@ let
inherit sha256; inherit sha256;
}; };
nativeBuildInputs = [ pkgconfig ]; passthru.python = python;
nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs;
buildInputs = [ buildInputs = [
pcre libxslt groff ncurses readline python3 libedit pcre libxslt groff ncurses readline libedit makeWrapper python
python3.pkgs.docutils makeWrapper ];
] ++ extraBuildInputs;
buildFlags = "localstatedir=/var/spool"; buildFlags = "localstatedir=/var/spool";
@ -41,14 +42,17 @@ in
varnish4 = common { varnish4 = common {
version = "4.1.10"; version = "4.1.10";
sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n"; sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n";
python = python2;
}; };
varnish5 = common { varnish5 = common {
version = "5.2.1"; version = "5.2.1";
sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
python = python2;
}; };
varnish6 = common { varnish6 = common {
version = "6.2.0"; version = "6.2.0";
sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"; sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3";
extraBuildInputs = [ python3.pkgs.sphinx ]; python = python3;
extraNativeBuildInputs = [ python3.pkgs.sphinx ];
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.3"; version = "0.3";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf"; sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf";
}; };
nativeBuildInputs = [ pkgconfig docutils autoreconfHook ]; nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ];
buildInputs = [ varnish python ]; buildInputs = [ varnish ];
postPatch = '' postPatch = ''
substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
''; '';

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.14.0"; version = "0.14.0";
@ -11,8 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40"; sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ]; nativeBuildInputs = [
buildInputs = [ varnish python ]; autoreconfHook
docutils
pkgconfig
removeReferencesTo
varnish.python # use same python version as varnish server
];
buildInputs = [ varnish ];
postPatch = '' postPatch = ''
substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal" substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal"

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }: { stdenv, fetchurl, pkgconfig, varnish, docutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.0"; version = "1.2.0";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly"; sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly";
}; };
nativeBuildInputs = [ pkgconfig docutils ]; nativeBuildInputs = [ pkgconfig docutils varnish.python ];
buildInputs = [ varnish python ]; buildInputs = [ varnish ];
configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {