diff options
| author | Izorkin <izorkin@elven.pw> | 2021-01-03 16:36:16 +0300 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2021-01-03 21:55:01 +0100 |
| commit | 131e617f777101cb947f047195d9d074be95a601 (patch) | |
| tree | dbf0ddcd952f38d78e7ae81772cb9c356f853def /pkgs/applications/networking/sniffers | |
| parent | e95ef6a681edcef426cb9148b5bd037d52601d4b (diff) | |
wireshark-*: pass in overridden libpcap in all-packages.nix
This allows building wireshark-* with a explicitly disabled bluezSupport in an overlay.
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 66292e20c525d..cb29857e168d5 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 ] |