wireshark: include nghttp2 by default

Without nghttp2 included, Wireshark's HTTP/2 dissector is rather neutered,
and the UI gives no indication of why.
This commit is contained in:
edef 2019-05-24 06:18:19 +00:00 committed by Bjørn Forsman
parent 52fde0733d
commit 99ece30213

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares { stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , libssh, nghttp2, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
, withQt ? true, qt5 ? null , withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp , ApplicationServices, SystemConfiguration, gmp
}: }:
@ -33,7 +33,7 @@ in stdenv.mkDerivation {
]; ];
buildInputs = [ buildInputs = [
gettext pcre perl libpcap lua5 libssh openssl libgcrypt gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isLinux [ libcap libnl ]