commit 00b9bdc61f963626394f652c3f67b414922bb5ee

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #238914 from wegank/wireshark-darwin

wireshark: fix build on x86_64-darwin

authored by

Weijia Wang and committed by

GitHub 2 years ago 00b9bdc6 481fc5c7

+3 -3

2 changed files

expand all

unified split

pkgs

applications

networking

sniffers

wireshark

default.nix

top-level

all-packages.nix

+1 -1

pkgs/applications/networking/sniffers/wireshark/default.nix

··· 82 nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ] 83 ++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook ]; 84 85 - depsBuildBuild = [ buildPackages.stdenv.cc ]; 86 87 buildInputs = [ 88 gettext

··· 82 nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ] 83 ++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook ]; 84 85 + depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.stdenv.cc ]; 86 87 buildInputs = [ 88 gettext

+2 -2

pkgs/top-level/all-packages.nix

··· 30945 30946 welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; 30947 30948 - wireshark = callPackage ../applications/networking/sniffers/wireshark { 30949 - inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; 30950 libpcap = libpcap.override { withBluez = stdenv.isLinux; }; 30951 }; 30952 wireshark-qt = wireshark;

··· 30945 30946 welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; 30947 30948 + wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark { 30949 + inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration; 30950 libpcap = libpcap.override { withBluez = stdenv.isLinux; }; 30951 }; 30952 wireshark-qt = wireshark;