From a97e16e4ec4519a3d2843c0a78cc8879b0fa65c3 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 8 Apr 2019 22:50:42 +0200 Subject: [PATCH] wireshark: fix Wireshark.app on darwin Generalize install_name_tool fixup calls for Wireshark.app to avoid breaking when version numbers change. --- .../networking/sniffers/wireshark/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 40fc03a8120..46869ecb24f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -64,10 +64,10 @@ in stdenv.mkDerivation { mkdir -p $out/Applications mv $out/bin/Wireshark.app $out/Applications/Wireshark.app - for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do - install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib - install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib - install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib + for f in $(find $out/Applications/Wireshark.app/Contents/PlugIns -name "*.so"); do + for dylib in $(otool -L $f | awk '/^\t*lib/ {print $1}'); do + install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" + done done wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \