From 6d3183e7daa07d730d644803b842c0696e02f01e Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Tue, 13 Dec 2016 00:45:05 +0100 Subject: [PATCH] nghttp2: refactor (close #21029) Turning the dependencies unrelated to the base libnghttp2 into proper options. vcunat modified the commit slightly. --- pkgs/development/libraries/nghttp2/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index f7a026c52d46..0697b05c0a5d 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -2,9 +2,19 @@ # Optional Dependencies , openssl ? null, libev ? null, zlib ? null -#, jansson ? null, boost ? null, libxml2 ? null, jemalloc ? null +, enableHpack ? false, jansson ? null +, enableAsioLib ? false, boost ? null +, enableGetAssets ? false, libxml2 ? null +, enableJemalloc ? false, jemalloc ? null }: +assert enableHpack -> jansson != null; +assert enableAsioLib -> boost != null; +assert enableGetAssets -> libxml2 != null; +assert enableJemalloc -> jemalloc != null; + +with { inherit (stdenv.lib) optional; }; + stdenv.mkDerivation rec { name = "nghttp2-${version}"; version = "1.17.0"; @@ -18,7 +28,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libev zlib ]; + buildInputs = [ openssl libev zlib ] + ++ optional enableHpack jansson + ++ optional enableAsioLib boost + ++ optional enableGetAssets libxml2 + ++ optional enableJemalloc jemalloc; enableParallelBuilding = true;