diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-06-12 01:12:50 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-06-12 09:15:29 -0400 |
| commit | d2b670291fafe771501effe1e4917d92440bf390 (patch) | |
| tree | 2f64d49fccf9db6a7a50ef1648201a20a6ef2d79 | |
| parent | 489ed84733d9cf19c72c879c5a0f5b55f4fb7348 (diff) | |
| download | nixpkgs-d2b670291fafe771501effe1e4917d92440bf390.tar nixpkgs-d2b670291fafe771501effe1e4917d92440bf390.tar.gz nixpkgs-d2b670291fafe771501effe1e4917d92440bf390.tar.bz2 nixpkgs-d2b670291fafe771501effe1e4917d92440bf390.tar.lz nixpkgs-d2b670291fafe771501effe1e4917d92440bf390.tar.xz nixpkgs-d2b670291fafe771501effe1e4917d92440bf390.tar.zst nixpkgs-d2b670291fafe771501effe1e4917d92440bf390.zip | |
darwin.Libsystem: get asl.h from upstream syslog sources
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix | 14 |
1 files changed, 13 insertions, 1 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 d9747b6cdc0..7f4fd0fe518 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchzip +{ lib, stdenv, buildPackages, fetchzip, fetchFromGitHub , appleDerivation', xnu, Libc, Libm, libdispatch, Libinfo , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto , copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libmalloc, libplatform, libpthread @@ -30,6 +30,15 @@ let fi ''; }; + + # Libsystem needs `asl.h` from syslog. This is the version corresponding to the 10.12 SDK + # source release, but it hasn’t changed in newer versions. + syslog.src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "syslog"; + rev = "syslog-349.50.5"; + hash = "sha256-tXLW/TNsluhO1X9Rv3FANyzyOe5TE/hZz0gVo7JGvHA="; + }; in appleDerivation' stdenv { dontBuild = true; @@ -63,6 +72,9 @@ appleDerivation' stdenv { (cd ${buildPackages.darwin.cctools.dev}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o) + # 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 + mkdir -p $out/include/os cp ${darling.src}/src/libc/os/activity.h $out/include/os |