diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2024-03-16 19:21:09 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2024-03-16 22:46:03 -0400 |
| commit | 55505c558fb8a6c4285c9c5d93675a04727e04fc (patch) | |
| tree | e1e6892d7649cd4dd75083322914dc046131b8c0 /pkgs/os-specific/darwin | |
| parent | b55261221775d99deaea5f67be80c45171120b38 (diff) | |
darwin.libplatform: fix build of 11.0 SDK source release
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix | 17 |
2 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 081c501a55397..978038fc111f1 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -276,7 +276,9 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { libmalloc = if stdenv.isx86_64 then applePackage "libmalloc" "osx-10.12.6" "sha256-brfG4GEF2yZipKdhlPq6DhT2z5hKYSb2MAmffaikdO4=" {} else macosPackages_11_0_1.libmalloc; - libplatform = applePackage "libplatform" "osx-10.12.6" "sha256-6McMTjw55xtnCsFI3AB1osRagnuB5pSTqeMKD3gpGtM=" {}; + libplatform = if stdenv.isx86_64 then + applePackage "libplatform" "osx-10.12.6" "sha256-6McMTjw55xtnCsFI3AB1osRagnuB5pSTqeMKD3gpGtM=" {} + else macosPackages_11_0_1.libplatform; libpthread = applePackage "libpthread" "osx-10.12.6" "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {}; libresolv = applePackage "libresolv" "osx-10.12.6" "sha256-FtvwjJKSFX6j9APYPC8WLXVOjbHLZa1Gcoc8yxLy8qE=" {}; Libsystem = applePackage "Libsystem" "osx-10.12.6" "sha256-zvRdCP//TjKCGAqm/5nJXPppshU1cv2fg/L/yK/olGQ=" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 39c801962692f..e0b25d27778a9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -1,9 +1,10 @@ -{ appleDerivation', stdenvNoCC }: +{ lib, appleDerivation', stdenvNoCC }: -appleDerivation' stdenvNoCC { +appleDerivation' stdenvNoCC (finalAttrs: { installPhase = '' mkdir $out cp -r include $out/include + test -d private && cp -r private/* $out/include ''; appleHeaders = '' @@ -27,6 +28,12 @@ appleDerivation' stdenvNoCC { platform/introspection_private.h platform/string.h setjmp.h - ucontext.h - ''; -} + '' + ( + if lib.versionAtLeast finalAttrs.version "254.40.4" then '' + string_x86.h + ucontext.h + '' else '' + ucontext.h + '' + ); +}) |