diff options
author | Chen <c@jia.je> | 2022-07-09 22:39:31 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-09 10:39:31 -0400 |
commit | 8073a6fb0988654c84f1c1c63301f9b854a3925f (patch) | |
tree | 55768027f81e920c6a217eb513cfabf2def544af /pkgs/os-specific/darwin/apple-source-releases/default.nix | |
parent | 449ceff4fab77e84fb53615eaee324821fcb1e2d (diff) |
darwin.xnu: fix build on aarch64-darwin (#179921)
- Use xnu from macOS 11.0 packages - Patch iig related usage - Add a new list of headers for arm64
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases/default.nix')
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index d2d21cc9d6cb2..3636b6e3763ce 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -280,9 +280,11 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { objc4 = applePackage "objc4" "osx-10.12.6" "1cj1vhbcs9pkmag2ms8wslagicnq9bxi2qjkszmp3ys7z7ccrbwz" {}; ppp = applePackage "ppp" "osx-10.12.6" "1kcc2nc4x1kf8sz0a23i6nfpvxg381kipi0qdisrp8x9z2gbkxb8" {}; removefile = applePackage "removefile" "osx-10.12.6" "0jzjxbmxgjzhssqd50z7kq9dlwrv5fsdshh57c0f8mdwcs19bsyx" {}; - xnu = applePackage "xnu" "osx-10.12.6" "1sjb0i7qzz840v2h4z3s4jyjisad4r5yyi6sg8pakv3wd81i5fg5" { + xnu = if stdenv.isx86_64 then + applePackage "xnu" "osx-10.12.6" "1sjb0i7qzz840v2h4z3s4jyjisad4r5yyi6sg8pakv3wd81i5fg5" { python3 = pkgs.buildPackages.buildPackages.python3; # TODO(@Ericson2314) this shouldn't be needed. - }; + } + else macosPackages_11_0_1.xnu; hfs = applePackage "hfs" "osx-10.12.6" "1mj3xvqpq1mgd80b6kl1s04knqnap7hccr0gz8rjphalq14rbl5g" {}; Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; adv_cmds = applePackage "adv_cmds" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; |