public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #20506: wireshark: add darwin support

Browse Source
This commit is contained in:
Vladimír Čunát 2016-11-21 18:05:11 +01:00
commit baa73cd6e0
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -3,6 +3,7 @@
, zlib , zlib
, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null , withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
, withQt ? false, qt4 ? null , withQt ? false, qt4 ? null
, ApplicationServices, SystemConfiguration, gmp
}: }:
assert withGtk -> !withQt && gtk2 != null; assert withGtk -> !withQt && gtk2 != null;
@ -25,9 +26,11 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls
geoip libnl c-ares python libcap glib zlib geoip c-ares python glib zlib
] ++ optional withQt qt4 ] ++ optional withQt qt4
++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]); ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf])
++ optionals stdenv.isLinux [ libcap libnl ]
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
@ -68,7 +71,7 @@ stdenv.mkDerivation {
experts. It runs on UNIX, OS X and Windows. experts. It runs on UNIX, OS X and Windows.
''; '';
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ]; maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ];
}; };
} }

1
pkgs/top-level/all-packages.nix
View File

@ -12964,6 +12964,7 @@ in
wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { wireshark-cli = callPackage ../applications/networking/sniffers/wireshark {
withQt = false; withQt = false;
withGtk = false; withGtk = false;
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
}; };
wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-gtk = wireshark-cli.override { withGtk = true; };
wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark-qt = wireshark-cli.override { withQt = true; };