From b7a6c33d1afe332de0c6735de52db5aa0ef0bb48 Mon Sep 17 00:00:00 2001 From: Simon Engmann Date: Thu, 6 Nov 2025 18:13:23 +0100 Subject: [PATCH 1/2] wireshark: set Darwin minimum SDK version to 12.0 Required by Qt 6. CMake will error without this. --- pkgs/applications/networking/sniffers/wireshark/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 1d74c153494f..aafea4cae0e4 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -9,6 +9,7 @@ buildPackages, c-ares, cmake, + darwinMinVersionHook, fixDarwinDylibNames, flex, gettext, @@ -147,6 +148,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gmp + # Required by Qt 6 + (darwinMinVersionHook "12.0") ]; strictDeps = true; From d7e8af6a10e29a38fe999f5fdc8fc0b463aab1de Mon Sep 17 00:00:00 2001 From: Simon Engmann Date: Thu, 6 Nov 2025 18:14:55 +0100 Subject: [PATCH 2/2] wireshark: fix extcap directory Starting with Wireshark 4.6.0, the extcap binaries are placed under `libexec` instead of `lib`. --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index aafea4cae0e4..a80ee39d368d 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { flags+=(-change @rpath/"$(basename "$file")" "$file") done - for file in $out/lib/wireshark/extcap/*; do + for file in $out/libexec/wireshark/extcap/*; do if [ -L "$file" ]; then continue; fi echo "$file: fixing dylib references" # note that -id does nothing on binaries @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { rm -rf $out/Applications/Wireshark.app/Contents/MacOS/extcap $out/Applications/Wireshark.app/Contents/PlugIns mkdir -p $out/Applications/Wireshark.app/Contents/PlugIns cp -r $out/lib/wireshark/plugins $out/Applications/Wireshark.app/Contents/PlugIns/wireshark - cp -r $out/lib/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap + cp -r $out/libexec/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap ''; meta = {