From 105fead2aab8e4bfcd84dbf456667751f83f07d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 11 Dec 2016 17:50:28 +0100 Subject: [PATCH] nghttp2 cleanup: unneeded patching, unused inputs Suggested on https://github.com/NixOS/nixpkgs/pull/21029#issuecomment-266290756 --- pkgs/development/libraries/nghttp2/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index a035cccda7f..f7a026c52d4 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig # Optional Dependencies -, openssl ? null, libev ? null, zlib ? null, jansson ? null, boost ? null -, libxml2 ? null, jemalloc ? null +, openssl ? null, libev ? null, zlib ? null +#, jansson ? null, boost ? null, libxml2 ? null, jemalloc ? null }: stdenv.mkDerivation rec { @@ -15,12 +15,6 @@ stdenv.mkDerivation rec { sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a"; }; - # Configure script searches for a symbol which does not exist in jemalloc on Darwin - # Reported upstream in https://github.com/tatsuhiro-t/nghttp2/issues/233 - postPatch = if stdenv.isDarwin && jemalloc != null then '' - substituteInPlace configure --replace "malloc_stats_print" "je_malloc_stats_print" - '' else null; - outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ];