diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-04 00:57:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 00:57:38 +0000 |
| commit | 581059aed4a202bf50b5f27b06234151d8653e14 (patch) | |
| tree | b6be55f925a711140368f608255ae4c70d7b28c1 /pkgs/applications/networking/sniffers | |
| parent | c40e1d8c9500ed56180aa0cdb153783b444ac8e0 (diff) | |
| parent | 2554c5008c544686f098bd97a53c5cca2a19267c (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking/sniffers')
| -rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d57e82728135f..c5008bf0790bb 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,6 @@ with stdenv.lib; let version = "3.4.2"; variant = if withQt then "qt" else "cli"; - pcap = libpcap.override { withBluez = stdenv.isLinux; }; in stdenv.mkDerivation { pname = "wireshark-${variant}"; @@ -39,7 +38,7 @@ in stdenv.mkDerivation { ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ - gettext pcre perl pcap lua5 libssh nghttp2 openssl libgcrypt + gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] |