From c1a80535adffc10b333151a4f2b9e845a06f88bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 15 Jan 2014 16:44:52 +0100 Subject: [PATCH] wireshark: update from 1.10.5 to 1.11.2 --- .../networking/sniffers/wireshark/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index a57ea9389c6..7ed23aae439 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares, gnutls, libgcrypt -, geoip, heimdal, lua5, gtk, makeDesktopItem +, geoip, heimdal, lua5, gtk, makeDesktopItem, qt5 }: -let version = "1.10.5"; in +let version = "1.11.2"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "1xa1l6z8n1gwnyv5mq4zmyr0afy6s0qpl9wqflg3ipbkjpd908d0"; + sha256 = "077hjnmqn44s8dx3pc38bxps5liicjnhzrnf6ky2x60m2cp7ngr3"; }; - buildInputs = - [ bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls geoip libnl c-ares gtk ]; + buildInputs = [ + bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls + geoip libnl c-ares gtk qt5 + ]; configureFlags = "--disable-usr-local --enable-packet-editor --with-ssl"; @@ -30,7 +32,7 @@ stdenv.mkDerivation { postInstall = '' mkdir -p "$out"/share/applications/ mkdir -p "$out"/share/icons/ - cp "$desktopItem"/share/applications/* "$out"/share/applications/ + cp "$desktopItem/share/applications/"* "$out/share/applications/" cp image/wsicon.svg "$out"/share/icons/wireshark.svg '';