darwin.libpcap: disable condition on PRIVATE to expose symbol; mullvad: fix darwin build (#352747)

pkgs/applications/networking/mullvad/mullvad.nix

@@ -10,6 +10,7 @@
 , libnftnl
 , libmnl
 , libwg
+, darwin
 , enableOpenvpn ? true
 , openvpn-mullvad
 , shadowsocks-rust
@@ -51,11 +52,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)

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 = [