diff options
| author | Austin Seipp <aseipp@pobox.com> | 2018-08-08 18:47:30 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-08-08 18:59:22 -0500 |
| commit | 8f8b7e1b8658d3a11655ed423b14140d5c721864 (patch) | |
| tree | 035884324e76243f91324e6eb00ebc9e6010c3a6 /pkgs/servers/http | |
| parent | 078da082b695e56b025edf7da52b753e2b5087f2 (diff) | |
| download | nixlib-8f8b7e1b8658d3a11655ed423b14140d5c721864.tar nixlib-8f8b7e1b8658d3a11655ed423b14140d5c721864.tar.gz nixlib-8f8b7e1b8658d3a11655ed423b14140d5c721864.tar.bz2 nixlib-8f8b7e1b8658d3a11655ed423b14140d5c721864.tar.lz nixlib-8f8b7e1b8658d3a11655ed423b14140d5c721864.tar.xz nixlib-8f8b7e1b8658d3a11655ed423b14140d5c721864.tar.zst nixlib-8f8b7e1b8658d3a11655ed423b14140d5c721864.zip | |
h2o: fix compatibility with libressl 2.7+
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/h2o/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index e05624fa46c8..ceffd3e0260d 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , pkgconfig, cmake -, libressl_2_6, libuv, zlib +, libressl, libuv, zlib }: with builtins; @@ -16,8 +16,17 @@ stdenv.mkDerivation rec { sha256 = "0jyvbp6cjiirj44nxqa2fi5y473gnc8awfn8zv82hb1y9rlxqfyv"; }; + # We have to fix up some function prototypes, because despite upstream h2o + # issue #1705 (https://github.com/h2o/h2o/issues/1706), libressl 2.7+ doesn't + # seem to work + patchPhase = '' + substituteInPlace ./deps/neverbleed/neverbleed.c \ + --replace 'static void RSA_' 'void RSA_' \ + --replace 'static int RSA_' 'int RSA_' + ''; + nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libressl_2_6 libuv zlib ]; + buildInputs = [ libressl libuv zlib ]; enableParallelBuilding = true; meta = { |