public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nghttp2 cleanup: unneeded patching, unused inputs

Browse Source 
Suggested on
https://github.com/NixOS/nixpkgs/pull/21029#issuecomment-266290756
This commit is contained in:
Vladimír Čunát 2016-12-11 17:50:28 +01:00
parent c3d20b2e43
commit 105fead2aa
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/nghttp2/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
# Optional Dependencies # Optional Dependencies
, openssl ? null, libev ? null, zlib ? null, jansson ? null, boost ? null , openssl ? null, libev ? null, zlib ? null
, libxml2 ? null, jemalloc ? null #, jansson ? null, boost ? null, libxml2 ? null, jemalloc ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,12 +15,6 @@ stdenv.mkDerivation rec {
sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a"; 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" ]; outputs = [ "out" "dev" "lib" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];