wireshark: fix extcap directory
Starting with Wireshark 4.6.0, the extcap binaries are placed under `libexec` instead of `lib`.
This commit is contained in:
@@ -195,7 +195,7 @@ stdenv.mkDerivation rec {
|
|||||||
flags+=(-change @rpath/"$(basename "$file")" "$file")
|
flags+=(-change @rpath/"$(basename "$file")" "$file")
|
||||||
done
|
done
|
||||||
|
|
||||||
for file in $out/lib/wireshark/extcap/*; do
|
for file in $out/libexec/wireshark/extcap/*; do
|
||||||
if [ -L "$file" ]; then continue; fi
|
if [ -L "$file" ]; then continue; fi
|
||||||
echo "$file: fixing dylib references"
|
echo "$file: fixing dylib references"
|
||||||
# note that -id does nothing on binaries
|
# 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
|
rm -rf $out/Applications/Wireshark.app/Contents/MacOS/extcap $out/Applications/Wireshark.app/Contents/PlugIns
|
||||||
mkdir -p $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/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 = {
|
meta = {
|
||||||
|
|||||||
Reference in New Issue
Block a user