Skip to content
Permalink
Browse files

wireshark: 2.2.5 -> 2.2.6

  • Loading branch information
peterhoeg committed Apr 25, 2017
1 parent c90998d commit 281e6967ce24961f7e2dc58e0688b62d1221933e
Showing with 9 additions and 4 deletions.
  1. +9 −4 pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -2,7 +2,7 @@
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
, libssh, zlib, cmake, extra-cmake-modules
, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
, withQt ? false, qt5 ? null
, withQt ? false, qt5 ? null, makeQtWrapper ? null
, ApplicationServices, SystemConfiguration, gmp
}:

@@ -12,20 +12,21 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;

let
version = "2.2.5";
version = "2.2.6";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";

in stdenv.mkDerivation {
name = "wireshark-${variant}-${version}";

src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
sha256 = "1j4sc3pmy8l6k41007spglcqiabjlzc7f85pn3jmjr9ksv9qipbm";
sha256 = "0jd89i9si43lyv3hsl6p1lkjmz4zagvc37wcbigsxxc5v8gda9zn";
};

nativeBuildInputs = [
bison cmake extra-cmake-modules flex
] ++ optional withGtk wrapGAppsHook;
] ++ optional withGtk wrapGAppsHook
++ optional withQt makeQtWrapper;

buildInputs = [
gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt
@@ -51,6 +52,10 @@ in stdenv.mkDerivation {
install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
'';

postFixup = optionalString withQt ''
wrapQtProgram $out/bin/wireshark
'';

enableParallelBuilding = true;

meta = with stdenv.lib; {

0 comments on commit 281e696

Please sign in to comment.
You can’t perform that action at this time.