cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #96950 from Izorkin/wireshark-cli

Browse source 
wireshark-*: pass in overridden libpcap in all-packages.nix
This commit is contained in:
Florian Klink 2021-01-03 21:55:53 +01:00 committed by GitHub
commit 90bc79c7cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/networking/sniffers/wireshark/default.nix
View file

@ -12,7 +12,6 @@ with stdenv.lib;
let let
version = "3.4.2"; version = "3.4.2";
variant = if withQt then "qt" else "cli"; variant = if withQt then "qt" else "cli";
pcap = libpcap.override { withBluez = stdenv.isLinux; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "wireshark-${variant}"; pname = "wireshark-${variant}";
@ -39,7 +38,7 @@ in stdenv.mkDerivation {
] ++ optional withQt qt5.wrapQtAppsHook; ] ++ optional withQt qt5.wrapQtAppsHook;
buildInputs = [ 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 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 ]

6
pkgs/top-level/all-packages.nix
View file

@ -21668,12 +21668,16 @@ in
wireshark = callPackage ../applications/networking/sniffers/wireshark { wireshark = callPackage ../applications/networking/sniffers/wireshark {
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
libpcap = libpcap.override { withBluez = stdenv.isLinux; };
}; };
wireshark-qt = wireshark; wireshark-qt = wireshark;
# The GTK UI is deprecated by upstream. You probably want the QT version. # The GTK UI is deprecated by upstream. You probably want the QT version.
wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead.";
wireshark-cli = wireshark.override { withQt = false; }; wireshark-cli = wireshark.override {
withQt = false;
libpcap = libpcap.override { withBluez = stdenv.isLinux; };
};
sngrep = callPackage ../applications/networking/sniffers/sngrep {}; sngrep = callPackage ../applications/networking/sniffers/sngrep {};