diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-06-12 09:11:11 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-06-12 09:15:29 -0400 |
| commit | a255182f567abd87acc59206780627bccab0d10d (patch) | |
| tree | 94938b7845cc6832149e730093cc3397bcefb9df | |
| parent | d2b670291fafe771501effe1e4917d92440bf390 (diff) | |
| download | nixpkgs-a255182f567abd87acc59206780627bccab0d10d.tar nixpkgs-a255182f567abd87acc59206780627bccab0d10d.tar.gz nixpkgs-a255182f567abd87acc59206780627bccab0d10d.tar.bz2 nixpkgs-a255182f567abd87acc59206780627bccab0d10d.tar.lz nixpkgs-a255182f567abd87acc59206780627bccab0d10d.tar.xz nixpkgs-a255182f567abd87acc59206780627bccab0d10d.tar.zst nixpkgs-a255182f567abd87acc59206780627bccab0d10d.zip | |
darwin.Libsystem: get pthread headers from darwin.libpthread
Some of the headers are symlinked to the root `include` in upstream Libsystem, so also symlink them there from `include/pthread`.
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 7f4fd0fe518..c9cc99a6550 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -72,6 +72,10 @@ appleDerivation' stdenv { (cd ${buildPackages.darwin.cctools.dev}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o) + for header in pthread.h pthread_impl.h pthread_spis.h sched.h; do + ln -s "$out/include/pthread/$header" "$out/include/$header" + done + # Copy `asl.h` from the syslog sources since it is no longer provided as part of Libc. cp ${syslog.src}/libsystem_asl.tproj/include/asl.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt index cdca44c7292..b6e608f81eb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt @@ -1381,7 +1381,6 @@ protocols/routed.h protocols/rwhod.h protocols/talkd.h protocols/timed.h -pthread.h pthread/introspection.h pthread/pthread.h pthread/pthread_impl.h @@ -1389,9 +1388,6 @@ pthread/pthread_spis.h pthread/qos.h pthread/sched.h pthread/spawn.h -pthread_impl.h -pthread_spis.h -pthread_workqueue.h pwd.h ranlib.h readpassphrase.h @@ -1414,7 +1410,6 @@ rpc/xdr.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h runetype.h -sched.h search.h secure/_common.h secure/_stdio.h |