From 20863d46680149af58124e108d9f248cc312fb5c Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 1 Nov 2024 00:40:37 +0100 Subject: [PATCH 1/2] darwin.libpcap: disable condition on PRIVATE to expose symbol --- .../darwin/apple-source-releases/libpcap/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix index 223dc3858a94..243f66f56d6b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix @@ -4,7 +4,6 @@ apple-sdk_15, bison, bluez, - fetchFromGitHub, flex, mkAppleDerivation, stdenv, @@ -92,6 +91,8 @@ mkAppleDerivation { postPatch = '' substituteInPlace libpcap/Makefile.in \ --replace-fail '@PLATFORM_C_SRC@' '@PLATFORM_C_SRC@ pcap-darwin.c pcap-util.c pcapng.c' + substituteInPlace libpcap/pcap/pcap.h \ + --replace-fail '#if PRIVATE' '#if 1' ''; configureFlags = [ From 2ff2261bd1b01ccfb01740728145d861534d9516 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 1 Nov 2024 00:42:11 +0100 Subject: [PATCH 2/2] mullvad: fix darwin build --- pkgs/applications/networking/mullvad/mullvad.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 478c66282133..a069a8b65f42 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -10,6 +10,7 @@ , libnftnl , libmnl , libwg +, darwin , enableOpenvpn ? true , openvpn-mullvad , shadowsocks-rust @@ -55,11 +56,15 @@ rustPlatform.buildRustPackage rec { fakeGoCopyLibwg ]; - buildInputs = [ - dbus.dev - libnftnl - libmnl - ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + dbus.dev + libnftnl + libmnl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libpcap + ]; postInstall = '' compdir=$(mktemp -d)