From 1daa2e5a7e853b1e4855dd937a44707a85ea9c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 19 Sep 2014 17:44:28 +0200 Subject: [PATCH] wireshark: update to 1.12.1 (latest stable) 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. --- .../networking/sniffers/wireshark/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 272bae14a12..af1b39170f8 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -3,14 +3,14 @@ , libcap }: -let version = "1.11.2"; in +let version = "1.12.1"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { - url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "077hjnmqn44s8dx3pc38bxps5liicjnhzrnf6ky2x60m2cp7ngr3"; + url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2"; + sha256 = "0jsqpr4s5smadvlm881l8fkhhw384ak3apkq4wxr05gc2va6pcl2"; }; buildInputs = [ @@ -20,10 +20,6 @@ stdenv.mkDerivation { 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"; desktopItem = makeDesktopItem {