diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-18 11:24:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-18 11:24:18 +0200 |
| commit | e9aeb55f3bc5206606ca22db8ad01bcabb8118a4 (patch) | |
| tree | 48b3c280de3eb20282b583276eaf49b6fd511f23 /pkgs/servers | |
| parent | 71a7e221d8f0def852f3a692daa3904a50523b30 (diff) | |
| parent | 0eff1d9f2af05353a827a3896ebcc2bce20d2fdd (diff) | |
| download | nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.gz nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.bz2 nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.lz nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.xz nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.tar.zst nixlib-e9aeb55f3bc5206606ca22db8ad01bcabb8118a4.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/varnish/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index e1376a6c59f5..bf8e69bd9896 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,23 +1,27 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python, pythonPackages }: +, python, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.1.2"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "0jizha1mwqk42zmkrh80y07vfl78mg1d9pp5w83qla4xn9ras0ai"; + sha256 = "1qzwljdwp830l41nw4ils9hxly077zqn6wzhhmy8m516gq9min1r"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre libxslt groff ncurses readline python libedit - pythonPackages.docutils + pythonPackages.docutils makeWrapper ]; buildFlags = "localstatedir=/var/spool"; + postInstall = '' + wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}" + ''; + # https://github.com/varnishcache/varnish-cache/issues/1875 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; |