diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2021-11-21 22:56:20 -0500 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2022-01-03 21:32:52 -0500 |
| commit | a42a04fadd59769a1ef0584ec21442a5cb6fdef4 (patch) | |
| tree | 283dc82037f9f1181a773da92ab0c3ecd43ef4dd | |
| parent | 3791603924420581557604258f16bb3ed0c03b00 (diff) | |
| download | nixpkgs-a42a04fadd59769a1ef0584ec21442a5cb6fdef4.tar nixpkgs-a42a04fadd59769a1ef0584ec21442a5cb6fdef4.tar.gz nixpkgs-a42a04fadd59769a1ef0584ec21442a5cb6fdef4.tar.bz2 nixpkgs-a42a04fadd59769a1ef0584ec21442a5cb6fdef4.tar.lz nixpkgs-a42a04fadd59769a1ef0584ec21442a5cb6fdef4.tar.xz nixpkgs-a42a04fadd59769a1ef0584ec21442a5cb6fdef4.tar.zst nixpkgs-a42a04fadd59769a1ef0584ec21442a5cb6fdef4.zip | |
libresolv: fix build on aarch64-darwin
Use `configdHeaders` instead of `configd`. This fixes #134292.
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 7a87d7abd73..90cb4a99bfc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -297,9 +297,11 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { top = applePackage "top" "osx-10.11.6" "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {}; PowerManagement = applePackage "PowerManagement" "osx-10.11.6" "1llimhvp0gjffd47322lnjq7cqwinx0c5z7ikli04ad5srpa68mh" {}; + # `configdHeaders` can’t use an override because `pkgs.darwin.configd` on aarch64-darwin will + # be replaced by SystemConfiguration.framework from the macOS SDK. configdHeaders = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" { headersOnly = true; - Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; + Security = null; }; libutilHeaders = pkgs.darwin.libutil.override { headersOnly = true; }; hfsHeaders = pkgs.darwin.hfs.override { headersOnly = true; }; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix index 53fc019768d..2a8a609472a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix @@ -1,9 +1,9 @@ -{ lib, appleDerivation', stdenv, stdenvNoCC, Libinfo, configd, mDNSResponder +{ lib, appleDerivation', stdenv, stdenvNoCC, Libinfo, configdHeaders, mDNSResponder , headersOnly ? false }: appleDerivation' (if headersOnly then stdenvNoCC else stdenv) { - buildInputs = lib.optionals (!headersOnly) [ Libinfo configd mDNSResponder ]; + buildInputs = lib.optionals (!headersOnly) [ Libinfo configdHeaders mDNSResponder ]; buildPhase = lib.optionalString (!headersOnly) '' $CC -I. -c dns_util.c |