From 45eadff7bee0f6a8024f71bc7ae9f55a3b0b582d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 23:13:44 +0300 Subject: [PATCH] wireshark: fix build on x86_64-darwin (#239023) (cherry picked from commit 237bd856cfb1b5d5dd34ea3ef9882cb14ada93a6) Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/applications/networking/sniffers/wireshark/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 347e2dac66ad..ff794e0588b9 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e1d41b2498c..720682eadfc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;