diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-08-13 05:46:15 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-08-15 07:58:38 -0700 |
commit | c74db7340d6df67ba3b5d847b384d65cc7dea621 (patch) | |
tree | 71d41462ad250e6b466df54ad4358deb28a95362 /pkgs/servers/varnish | |
parent | 14368b71d03e8605eb3672d3df0ac3a57f530c0b (diff) | |
download | nixlib-c74db7340d6df67ba3b5d847b384d65cc7dea621.tar nixlib-c74db7340d6df67ba3b5d847b384d65cc7dea621.tar.gz nixlib-c74db7340d6df67ba3b5d847b384d65cc7dea621.tar.bz2 nixlib-c74db7340d6df67ba3b5d847b384d65cc7dea621.tar.lz nixlib-c74db7340d6df67ba3b5d847b384d65cc7dea621.tar.xz nixlib-c74db7340d6df67ba3b5d847b384d65cc7dea621.tar.zst nixlib-c74db7340d6df67ba3b5d847b384d65cc7dea621.zip |
varnish5: fix build
Diffstat (limited to 'pkgs/servers/varnish')
-rw-r--r-- | pkgs/servers/varnish/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 4ee23e68265f..16386d5b65de 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python3, makeWrapper }: +, python2, python3, makeWrapper }: let - common = { version, sha256, extraBuildInputs ? [] }: + common = { version, sha256, python, extraNativeBuildInputs ? [] }: stdenv.mkDerivation rec { name = "varnish-${version}"; @@ -11,11 +11,10 @@ let inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs; buildInputs = [ - pcre libxslt groff ncurses readline python3 libedit - python3.pkgs.docutils makeWrapper - ] ++ extraBuildInputs; + pcre libxslt groff ncurses readline libedit makeWrapper python + ]; buildFlags = "localstatedir=/var/spool"; @@ -41,14 +40,17 @@ in varnish4 = common { version = "4.1.10"; sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n"; + python = python2; }; varnish5 = common { version = "5.2.1"; sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; + python = python2; }; varnish6 = common { version = "6.2.0"; sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"; - extraBuildInputs = [ python3.pkgs.sphinx ]; + python = python3; + extraNativeBuildInputs = [ python3.pkgs.sphinx ]; }; } |