nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 02:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: fix build on x86_64-darwin (#239023)

Browse Source 
(cherry picked from commit 237bd856cf)

Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
This commit is contained in:
github-actions[bot]
2023-06-21 23:13:44 +03:00
committed by GitHub
parent fe94455f35
commit 45eadff7be
2 changed files with 3 additions and 3 deletions
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

@@ -30605,8 +30605,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;