tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
wireshark: fix build w/musl using upstream commit
Will Dietz
8 years ago
3c750912
f48258fe
+7
-1
1 changed file
expand all
collapse all
unified
split
pkgs
applications
networking
sniffers
wireshark
default.nix
+7
-1
pkgs/applications/networking/sniffers/wireshark/default.nix
···
40
40
++ optionals stdenv.isLinux [ libcap libnl ]
41
41
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
42
42
43
43
-
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
43
43
+
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]
44
44
+
# https://code.wireshark.org/review/#/c/23728/
45
45
+
++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
46
46
+
name = "fix-timeout.patch";
47
47
+
url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0";
48
48
+
sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv";
49
49
+
});
44
50
45
51
postInstall = optionalString (withQt || withGtk) ''
46
52
${optionalString withGtk ''