@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
22, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
3−, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper
3+, libssh, nghttp2, zlib, cmake, makeWrapper
44, withQt ? true, qt5 ? null
55, ApplicationServices, SystemConfiguration, gmp
66}:
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
1010with lib;
1111
1212let
13− version = "3.4.3";
13+ version = "3.4.4";
1414 variant = if withQt then "qt" else "cli";
1515
1616in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
2020
2121 src = fetchurl {
2222 url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
23− sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl";
23+ sha256 = "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j";
2424 };
2525
2626 cmakeFlags = [
@@ -33,13 +33,11 @@ in stdenv.mkDerivation {
3333 # Avoid referencing -dev paths because of debug assertions.
3434 NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
3535
36− nativeBuildInputs = [
37− bison cmake flex pkg-config
38− ] ++ optional withQt qt5.wrapQtAppsHook;
36+ nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
3937
4038 buildInputs = [
4139 gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
42− libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
40+ libgpgerror gnutls geoip c-ares python3 glib zlib
4341 ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
4442 ++ optionals stdenv.isLinux [ libcap libnl ]
4543 ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
@@ -96,7 +94,7 @@ in stdenv.mkDerivation {
9694 meta = with lib; {
9795 homepage = "https://www.wireshark.org/";
9896 description = "Powerful network protocol analyzer";
99− license = licenses.gpl2;
97+ license = licenses.gpl2Plus;
10098
10199 longDescription = ''
102100 Wireshark (formerly known as "Ethereal") is a powerful network