diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-12 19:13:21 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:54:56 -0400 |
| commit | 9d2326c622ec57e7f8da7f7d5a9ec6286a4583fe (patch) | |
| tree | 378c67b7a665eed2c262f604b7a13efa4ae07439 /pkgs/os-specific/darwin | |
| parent | 4faa8d0238777055ec49e002c3f0300f4d014c38 (diff) | |
| download | nixpkgs-9d2326c622ec57e7f8da7f7d5a9ec6286a4583fe.tar nixpkgs-9d2326c622ec57e7f8da7f7d5a9ec6286a4583fe.tar.gz nixpkgs-9d2326c622ec57e7f8da7f7d5a9ec6286a4583fe.tar.bz2 nixpkgs-9d2326c622ec57e7f8da7f7d5a9ec6286a4583fe.tar.lz nixpkgs-9d2326c622ec57e7f8da7f7d5a9ec6286a4583fe.tar.xz nixpkgs-9d2326c622ec57e7f8da7f7d5a9ec6286a4583fe.tar.zst nixpkgs-9d2326c622ec57e7f8da7f7d5a9ec6286a4583fe.zip | |
Libsystem: get os/{log,trace,activity}.h from darling
This is the only place I can find the headers.
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix | 2 |
2 files changed, 6 insertions, 3 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 89fc01c36f5..7b19194be96 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,7 +1,7 @@ { stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread -, mDNSResponder, launchd, libutil, hfs }: +, mDNSResponder, launchd, libutil, hfs, darling }: appleDerivation rec { dontBuild = true; @@ -30,6 +30,11 @@ appleDerivation rec { (cd ${cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o) mkdir -p $out/include/os + + cp ${darling.src}/src/libc/os/activity.h $out/include/os + cp ${darling.src}/src/libc/os/log.h $out/include/os + cp ${darling.src}/src/duct/include/os/trace.h $out/include/os + cat <<EOF > $out/include/os/availability.h #ifndef __OS_AVAILABILITY__ #define __OS_AVAILABILITY__ diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 75e81656dcc..aaa3a1ebe32 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -114,8 +114,6 @@ appleDerivation ({ # Get rid of some junk lying around rm -rf $out/internal_hdr $out/usr $out/local - mv $out/include/libkern/os/log.h $out/include/os/log.h - # Add some symlinks ln -s $out/Library/Frameworks/System.framework/Versions/B \ $out/Library/Frameworks/System.framework/Versions/Current |