From 3c750912e1b092d338d1456d248d9008dca3c850 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 15:49:30 -0600 Subject: wireshark: fix build w/musl using upstream commit --- pkgs/applications/networking/sniffers/wireshark/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 5556a58ec564..84e10fb18bca 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -40,7 +40,13 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ] + # https://code.wireshark.org/review/#/c/23728/ + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "fix-timeout.patch"; + url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; + sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; + }); postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' -- cgit 1.4.1