diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-12 18:27:40 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-12 18:27:40 +0100 |
| commit | 2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1 (patch) | |
| tree | 79bd49af009aaea0dbb30ebe54feedd2d4bf8613 /pkgs | |
| parent | 1b3033ebfb1e92c3166b75c7f820d066f3dd3665 (diff) | |
| parent | 55bf8aa8c1f8cd60f52f64491a9eb5aaf6bbddde (diff) | |
| download | nixpkgs-2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1.tar nixpkgs-2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1.tar.gz nixpkgs-2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1.tar.bz2 nixpkgs-2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1.tar.lz nixpkgs-2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1.tar.xz nixpkgs-2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1.tar.zst nixpkgs-2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1.zip | |
Merge #267079: darwin.mDNSResponder: patch header to match SDK
...into staging-next
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/configd/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix | 5 |
2 files changed, 4 insertions, 2 deletions
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 3b8512cd89c..998bc867e75 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 ]; }; 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 4082f5b760c..0ba4caee628 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' ''; } |