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

wireshark: update to 1.12.1 (latest stable)

Browse Source 
There are no references to g_memmove in the source anymore, so remove
the now unneeded (and failing!) sed fixup.

Sourceforge no longer has wireshark sources, the page tells users to
download from www.wireshark.org instead. So do that.
This commit is contained in:
Bjørn Forsman 2014-09-19 17:44:28 +02:00
parent 71230bafab
commit 1daa2e5a7e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,14 +3,14 @@
, libcap , libcap
}: }:
let version = "1.11.2"; in let version = "1.12.1"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wireshark-${version}"; name = "wireshark-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2";
sha256 = "077hjnmqn44s8dx3pc38bxps5liicjnhzrnf6ky2x60m2cp7ngr3"; sha256 = "0jsqpr4s5smadvlm881l8fkhhw384ak3apkq4wxr05gc2va6pcl2";
}; };
buildInputs = [ buildInputs = [
@ -20,10 +20,6 @@ stdenv.mkDerivation {
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
preConfigure = ''
sed -re 's/g_memmove/memmove/' -i $(grep -rl g_memmove .)
'';
configureFlags = "--disable-usr-local --disable-silent-rules --with-gtk2 --without-gtk3 --without-qt --with-ssl"; configureFlags = "--disable-usr-local --disable-silent-rules --with-gtk2 --without-gtk3 --without-qt --with-ssl";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {