Merge pull request #549 from bjornfor/wireshark
Wireshark: upgrade to 1.8.7 and add desktop item
This commit is contained in:
commit
19cba81e7f
@ -1,16 +1,17 @@
|
|||||||
{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison
|
{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison
|
||||||
, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip
|
, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip
|
||||||
, heimdal, python, lynx, lua5
|
, heimdal, python, lynx, lua5
|
||||||
|
, makeDesktopItem
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let version = "1.8.6"; in
|
let version = "1.8.7"; in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "wireshark-${version}";
|
name = "wireshark-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
|
url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
|
||||||
sha256 = "1siifci4z7nxp6a1ghk2azw9v0hxi2vq26n3ms7n89kcj8zfs8i7";
|
sha256 = "0hm8zisy5dg7sfhh7rvgnpffq2qcw0syd8k5kns8j0j13sf44zjw";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
@ -20,13 +21,30 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";
|
configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";
|
||||||
|
|
||||||
|
desktopItem = makeDesktopItem {
|
||||||
|
name = "Wireshark";
|
||||||
|
exec = "wireshark";
|
||||||
|
icon = "wireshark";
|
||||||
|
comment = "Powerful network protocol analysis suite";
|
||||||
|
desktopName = "Wireshark";
|
||||||
|
genericName = "Network packet analyzer";
|
||||||
|
categories = "Network;System";
|
||||||
|
};
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mkdir -p "$out"/share/applications/
|
||||||
|
mkdir -p "$out"/share/icons/
|
||||||
|
cp "$desktopItem"/share/applications/* "$out"/share/applications/
|
||||||
|
cp image/wsicon.svg "$out"/share/icons/wireshark.svg
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.wireshark.org/;
|
homepage = http://www.wireshark.org/;
|
||||||
description = "a powerful network protocol analyzer";
|
description = "a powerful network protocol analyzer";
|
||||||
license = stdenv.lib.licenses.gpl2;
|
license = stdenv.lib.licenses.gpl2;
|
||||||
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Wireshark (formerly known as "Etherreal") is a powerful network
|
Wireshark (formerly known as "Ethereal") is a powerful network
|
||||||
protocol analyzer developed by an international team of networking
|
protocol analyzer developed by an international team of networking
|
||||||
experts. It runs on UNIX, OS X and Windows.
|
experts. It runs on UNIX, OS X and Windows.
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user