diff options
| author | Devin Singh <drsingh2518@icloud.com> | 2022-01-15 21:41:33 -0600 |
|---|---|---|
| committer | Devin Singh <drsingh2518@icloud.com> | 2022-01-18 06:52:26 -0600 |
| commit | c74a7840e2c0705971bf0fba9572580ba66a4588 (patch) | |
| tree | 6c1f77d114698b24ede91a45cebda522171caae4 | |
| parent | b254d2b1fefa96aed7f832ba5f1ab792ff50b8c4 (diff) | |
| download | nixpkgs-c74a7840e2c0705971bf0fba9572580ba66a4588.tar nixpkgs-c74a7840e2c0705971bf0fba9572580ba66a4588.tar.gz nixpkgs-c74a7840e2c0705971bf0fba9572580ba66a4588.tar.bz2 nixpkgs-c74a7840e2c0705971bf0fba9572580ba66a4588.tar.lz nixpkgs-c74a7840e2c0705971bf0fba9572580ba66a4588.tar.xz nixpkgs-c74a7840e2c0705971bf0fba9572580ba66a4588.tar.zst nixpkgs-c74a7840e2c0705971bf0fba9572580ba66a4588.zip | |
diskdev_cmds: fix build using arch's xnu source
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 5e098926d29..f0e852ca199 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -288,7 +288,9 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { adv_cmds = applePackage "adv_cmds" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; - diskdev_cmds = applePackage "diskdev_cmds" "osx-10.11.6" "1ssdyiaq5m1zfy96yy38yyknp682ki6bvabdqd5z18fa0rv3m2ar" {}; + diskdev_cmds = applePackage "diskdev_cmds" "osx-10.11.6" "1ssdyiaq5m1zfy96yy38yyknp682ki6bvabdqd5z18fa0rv3m2ar" { + macosPackages_11_0_1 = macosPackages_11_0_1; + }; network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {}; shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index 1daa4929610..ec252dca41c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,7 +1,10 @@ -{ lib, appleDerivation, xcbuildHook -, Libc, xnu, libutil }: +{ lib, appleDerivation, xcbuildHook, Libc, stdenv, macosPackages_11_0_1, xnu +, fetchurl, libutil }: -appleDerivation { +let + xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; + arch = if stdenv.isAarch64 then "arm" else "i386"; +in appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ libutil ]; @@ -11,11 +14,11 @@ appleDerivation { # ugly hacks for missing headers # most are bsd related - probably should make this a drv unpackFile ${Libc.src} - unpackFile ${xnu.src} - mkdir System sys machine i386 + unpackFile ${xnu-src} + mkdir System sys machine ${arch} cp xnu-*/bsd/sys/disklabel.h sys cp xnu-*/bsd/machine/disklabel.h machine - cp xnu-*/bsd/i386/disklabel.h i386 + cp xnu-*/bsd/${arch}/disklabel.h ${arch} cp -r xnu-*/bsd/sys System cp -r Libc-*/uuid System substituteInPlace diskdev_cmds.xcodeproj/project.pbxproj \ |