From a678c55faf2c8e69a771f36a49011c35d7f6da6f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 12 Nov 2023 09:40:22 -0500 Subject: [PATCH 1/2] darwin.mDNSResponder: patch header to match SDK The upstream source release for 765.50.9 defines `_DNS_SD_LIBDISPATCH` to `0` in `dns_sd.h`, but the SDK version of that header actually defines it to `1`. Having it defined to `0` causes packages that expect to use libdispatch-based symbols such as `DNSServiceSetDispatchQueue` to fail to build. Define it to match the SDK to fix those packages. --- .../darwin/apple-source-releases/mDNSResponder/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 4082f5b760cf..0ba4caee6289 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -4,6 +4,9 @@ appleDerivation' stdenvNoCC { dontBuild = true; installPhase = '' mkdir -p $out/include - cp mDNSShared/dns_sd.h $out/include + # TODO: Do this only for 765.50.9 once there is a way to apply version-specific + # logic in a source-release derivation. + substitute mDNSShared/dns_sd.h $out/include/dns_sd.h \ + --replace '#define _DNS_SD_LIBDISPATCH 0' '#define _DNS_SD_LIBDISPATCH 1' ''; } From 55bf8aa8c1f8cd60f52f64491a9eb5aaf6bbddde Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 12 Nov 2023 10:24:03 -0500 Subject: [PATCH 2/2] Revert "configd: fix build with clang 16" This reverts commit 550137e330ebb5e0d7b114f8af2e0d244e07dcb7. --- .../os-specific/darwin/apple-source-releases/configd/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 3b8512cd89ce..998bc867e757 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -21,7 +21,6 @@ appleDerivation' stdenv { NIX_CFLAGS_COMPILE = toString [ "-ISystemConfiguration.framework/Headers" "-I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders" - "-D_DNS_SD_LIBDISPATCH" # Needed for DNSServiceSetDispatchQueue to be available ]; };