ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

h2o: 2.2.6 -> 2.3.0-beta2, enable multi-output

Browse Source 
This also lets us remove a hack for supporting LibreSSL 2.7, since we're
now using 2.9 by default, anyway.

Finally, use Ninja to run the CMake build instead of Make -- speeds
things up for me by a few seconds.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2019-09-19 18:11:55 -05:00
parent 8dbca5e3ca
commit 889537352b
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/servers/http/h2o/default.nix
View File

@ -1,39 +1,30 @@
{ stdenv, fetchFromGitHub
, pkgconfig, cmake
, pkgconfig, cmake, ninja
, libressl, libuv, zlib
}:
with builtins;
stdenv.mkDerivation rec {
pname = "h2o";
version = "2.2.6";
pname = "h2o";
version = "2.3.0-beta2";
src = fetchFromGitHub {
owner = "h2o";
repo = "h2o";
rev = "refs/tags/v${version}";
sha256 = "0qni676wqvxx0sl0pw9j0ph7zf2krrzqc1zwj73mgpdnsr8rsib7";
sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n";
};
# 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_'
'';
outputs = [ "out" "man" "dev" "lib" ];
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ libressl libuv zlib ];
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ninja ];
buildInputs = [ libressl libuv zlib ];
meta = {
meta = with stdenv.lib; {
description = "Optimized HTTP/1 and HTTP/2 server";
homepage = https://h2o.examp1e.net;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
platforms = stdenv.lib.platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ thoughtpolice ];
platforms = platforms.linux;
};
}