dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #238914 from wegank/wireshark-darwin

Browse Source 
wireshark: fix build on x86_64-darwin
This commit is contained in:
Weijia Wang 2023-06-21 19:35:54 +03:00 committed by GitHub
commit 00b9bdc61f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -82,7 +82,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ]
++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.stdenv.cc ];
buildInputs = [
gettext

4
pkgs/top-level/all-packages.nix
View File

@ -30945,8 +30945,8 @@ with pkgs;
welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };
wireshark = callPackage ../applications/networking/sniffers/wireshark {
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration;
libpcap = libpcap.override { withBluez = stdenv.isLinux; };
};
wireshark-qt = wireshark;