diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-14 15:49:30 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:56 -0600 |
| commit | 3c750912e1b092d338d1456d248d9008dca3c850 (patch) | |
| tree | 6b15b0cb9babd09271cdd9194b6e677b11d77787 /pkgs | |
| parent | f48258fed25a77011e2cc7d629c7b7c22b1a2547 (diff) | |
| download | nixlib-3c750912e1b092d338d1456d248d9008dca3c850.tar nixlib-3c750912e1b092d338d1456d248d9008dca3c850.tar.gz nixlib-3c750912e1b092d338d1456d248d9008dca3c850.tar.bz2 nixlib-3c750912e1b092d338d1456d248d9008dca3c850.tar.lz nixlib-3c750912e1b092d338d1456d248d9008dca3c850.tar.xz nixlib-3c750912e1b092d338d1456d248d9008dca3c850.tar.zst nixlib-3c750912e1b092d338d1456d248d9008dca3c850.zip | |
wireshark: fix build w/musl using upstream commit
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
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 '' |