From fe91dd36d0de34f0868e251762c173acf9c0c6ac Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 17 Nov 2016 15:07:05 -0600 Subject: [PATCH] wireshark: add darwin support --- .../networking/sniffers/wireshark/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 99df01afa6a..af4c1da4b35 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -3,6 +3,7 @@ , zlib , withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null , withQt ? false, qt4 ? null +, ApplicationServices, SystemConfiguration, gmp }: assert withGtk -> !withQt && gtk2 != null; @@ -25,9 +26,11 @@ stdenv.mkDerivation { buildInputs = [ 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 - ++ (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 ]; @@ -68,7 +71,7 @@ stdenv.mkDerivation { 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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a881fc9ad..10da74e1d53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12887,6 +12887,7 @@ in wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { withQt = false; withGtk = false; + inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-qt = wireshark-cli.override { withQt = true; };