diff options
author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-06-12 09:13:47 -0400 |
---|---|---|
committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-06-12 17:11:54 -0400 |
commit | 23cb6c155b89b060eb2004cd0e1951a4097a81fe (patch) | |
tree | bdf55e49049383d62b4986752e9cae2e03880936 /pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix | |
parent | a255182f567abd87acc59206780627bccab0d10d (diff) | |
download | nixpkgs-23cb6c155b89b060eb2004cd0e1951a4097a81fe.tar nixpkgs-23cb6c155b89b060eb2004cd0e1951a4097a81fe.tar.gz nixpkgs-23cb6c155b89b060eb2004cd0e1951a4097a81fe.tar.bz2 nixpkgs-23cb6c155b89b060eb2004cd0e1951a4097a81fe.tar.lz nixpkgs-23cb6c155b89b060eb2004cd0e1951a4097a81fe.tar.xz nixpkgs-23cb6c155b89b060eb2004cd0e1951a4097a81fe.tar.zst nixpkgs-23cb6c155b89b060eb2004cd0e1951a4097a81fe.zip |
darwin.Libc: stop vendoring headers from other packages
A number of headers in Libc are being vendored from other packages. Instead of copying them from an earlier Libc, Libsystem now sources them from their respective packages (see below). This allows Libc_old to be dropped and avoids any potential clashes when building Libsystem. libmalloc: * malloc/malloc.h libplatform: * setjmp.h * ucontext.h * libkern/OSAtomic.h * libkern/OSCacheControl.h libpthread: * pthread*.h * sched.h * spawn.h syslog (vendored because only one file is needed): * asl.h xnu: * spawn.h (a different one from libpthread) * libproc.h
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix')
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 915d3a61f81..6ff3cec2f1e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation', stdenvNoCC, ed, unifdef, Libc_old, Libc_10-9 }: +{ appleDerivation', stdenvNoCC, ed, unifdef, Libc_10-9 }: appleDerivation' stdenvNoCC { nativeBuildInputs = [ ed unifdef ]; @@ -7,7 +7,6 @@ appleDerivation' stdenvNoCC { ./0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch ]; - # TODO: asl.h actually comes from syslog project now installPhase = '' export SRCROOT=$PWD export DSTROOT=$out @@ -18,20 +17,6 @@ appleDerivation' stdenvNoCC { cp ${./CrashReporterClient.h} $out/include/CrashReporterClient.h cp ${Libc_10-9}/include/NSSystemDirectories.h $out/include - - # Ugh Apple stopped releasing this stuff so we need an older one... - cp ${Libc_old}/include/spawn.h $out/include - cp ${Libc_old}/include/setjmp.h $out/include - cp ${Libc_old}/include/ucontext.h $out/include - cp ${Libc_old}/include/pthread*.h $out/include - cp ${Libc_old}/include/sched.h $out/include - cp -R ${Libc_old}/include/malloc $out/include - - mkdir -p $out/include/libkern - cp ${Libc_old}/include/asl.h $out/include - cp ${Libc_old}/include/libproc.h $out/include - cp ${Libc_old}/include/libkern/OSAtomic.h $out/include/libkern - cp ${Libc_old}/include/libkern/OSCacheControl.h $out/include/libkern ''; appleHeaders = builtins.readFile ./headers.txt; |