b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libresolv: fix build on aarch64-darwin

Browse source 
Use `configdHeaders` instead of `configd`.  This fixes #134292.
This commit is contained in:
Randy Eckenrode 2021-11-21 22:56:20 -05:00
parent 3791603924
commit a42a04fadd
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/darwin/apple-source-releases/default.nix
View file

@ -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; };

4
pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
View file

@ -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