cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

darwin.libplatform: fix build of 11.0 SDK source release

Browse source
This commit is contained in:
Randy Eckenrode 2024-03-16 19:21:09 -04:00
parent b552612217
commit 55505c558f
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
2 changed files with 15 additions and 6 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

@ -276,7 +276,9 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
libmalloc = if stdenv.isx86_64 then libmalloc = if stdenv.isx86_64 then
applePackage "libmalloc" "osx-10.12.6" "sha256-brfG4GEF2yZipKdhlPq6DhT2z5hKYSb2MAmffaikdO4=" {} applePackage "libmalloc" "osx-10.12.6" "sha256-brfG4GEF2yZipKdhlPq6DhT2z5hKYSb2MAmffaikdO4=" {}
else macosPackages_11_0_1.libmalloc; 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=" {}; libpthread = applePackage "libpthread" "osx-10.12.6" "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {};
libresolv = applePackage "libresolv" "osx-10.12.6" "sha256-FtvwjJKSFX6j9APYPC8WLXVOjbHLZa1Gcoc8yxLy8qE=" {}; libresolv = applePackage "libresolv" "osx-10.12.6" "sha256-FtvwjJKSFX6j9APYPC8WLXVOjbHLZa1Gcoc8yxLy8qE=" {};
Libsystem = applePackage "Libsystem" "osx-10.12.6" "sha256-zvRdCP//TjKCGAqm/5nJXPppshU1cv2fg/L/yK/olGQ=" {}; Libsystem = applePackage "Libsystem" "osx-10.12.6" "sha256-zvRdCP//TjKCGAqm/5nJXPppshU1cv2fg/L/yK/olGQ=" {};

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

@ -1,9 +1,10 @@
{ appleDerivation', stdenvNoCC }: { lib, appleDerivation', stdenvNoCC }:
appleDerivation' stdenvNoCC { appleDerivation' stdenvNoCC (finalAttrs: {
installPhase = '' installPhase = ''
mkdir $out mkdir $out
cp -r include $out/include cp -r include $out/include
test -d private && cp -r private/* $out/include
''; '';
appleHeaders = '' appleHeaders = ''
@ -27,6 +28,12 @@ appleDerivation' stdenvNoCC {
platform/introspection_private.h platform/introspection_private.h
platform/string.h platform/string.h
setjmp.h setjmp.h
ucontext.h '' + (
''; if lib.versionAtLeast finalAttrs.version "254.40.4" then ''
} string_x86.h
ucontext.h
'' else ''
ucontext.h
''
);
})