wireshark: Add Darwin support #36162
Conversation
|
This PR is conflicting |
|
@GrahamcOfBorg build wireshark |
| # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| # | ||
|
|
||
| +cmake_minimum_required(VERSION 3.7) |
There was a problem hiding this comment.
Can be merged as it is, but could you also try to send the patch upstream? This makes future updates easier.
There was a problem hiding this comment.
Does this looks interesting too you? @alagoutte
It fixes compilation in nixpkgs on macOS for us.
There was a problem hiding this comment.
the problem here is that the minimum version must be defined before project. Otherwise it complains about clang.
There was a problem hiding this comment.
Hi,
Yes, you can propose the fix on upstream
|
Success on x86_64-darwin (full log) Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
| done | ||
|
|
||
| wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \ | ||
| --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix} |
There was a problem hiding this comment.
@ttuegel I don't how much you know about qt on macOS, but is this the canonical solution?
There was a problem hiding this comment.
I don't know. I copied it from another derivation. Still learning the ropes.
There was a problem hiding this comment.
Usually it is read from your profile, for example ~/.nix-profile/lib/qt-5.10
But I am not sure about macOS.
There was a problem hiding this comment.
Do you have an example how that is done?
I browsed through different QT_PLUGIN_PATH styles. Some are the same as here, some use --prefix when adding to it. Some set it to be specific to the application in question.
There was a problem hiding this comment.
Maybe this is only set on nixos:
$ echo $QT_PLUGIN_PATH
/etc/profiles/per-user/joerg/lib/qt4/plugins:/etc/profiles/per-user/joerg/lib/kde4/plugins:/home/joerg/.nix-profile/lib/qt4/plugins:/home/joerg/.nix-profile/lib/kde4/plugins:/nix/var/nix/profiles/default/lib/qt4/plugins:/nix/var/nix/profiles/default/lib/kde4/plugins:/run/current-system/sw/lib/qt4/plugins:/run/current-system/sw/lib/kde4/plugins
|
Success on aarch64-linux (full log) Partial log (click to expand)
|
Motivation for this change
wireshark did not work for Darwin.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)I'm not sure why tshark plugins have correct dynamic library paths, but the Wireshark.app does not.
CMake patch fixes a problem where CMake cannot detect compiler features.