diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in index 0651d2a617b9..1d6647869cc6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in @@ -3,7 +3,7 @@ # Project settings -project('system_cmds', 'c', version : '@version@') +project('system_cmds', 'c', 'objc', version : '@version@') add_project_arguments( '-D__FreeBSD__', @@ -199,7 +199,9 @@ executable( 'gcore/corefile.c', 'gcore/dyld.c', 'gcore/dyld_shared_cache.c', + 'gcore/gcore_framework.m', 'gcore/main.c', + 'gcore/notes.c', 'gcore/sparse.c', 'gcore/threads.c', 'gcore/utils.c', @@ -575,6 +577,7 @@ executable( executable( 'zdump', + c_args : [ '-DHAVE_LOCALTIME_RZ=0' ], include_directories : 'zic', install : true, sources : 'zdump/zdump.c', diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix index ba2314470bce..b7239730e283 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix @@ -44,6 +44,7 @@ let '${libmalloc}/private/stack_logging.h' \ '${libplatform}/private/_simple.h' \ '${xnu}/libsyscall/wrappers/spawn/spawn_private.h' + touch "$out/include/btm.h" cp -r '${libdispatch}/private' "$out/include/dispatch" # Work around availability headers compatibility issue when building with an unprocessed SDK. @@ -59,6 +60,7 @@ let install -D -t "$out/include/os" \ '${Libc}/os/assumes.h' \ '${xnu}/libkern/os/base_private.h' + touch "$out/include/os/feature_private.h" install -D -t "$out/include/sys" \ '${xnu}/bsd/sys/csr.h' \ @@ -77,7 +79,7 @@ in mkAppleDerivation { releaseName = "system_cmds"; - xcodeHash = "sha256-KYOKLOwJyHwIQmIdCCN+UtiqKSr8NLPJudIOiznbfMw="; + xcodeHash = "sha256-gdtn3zNIneZKy6+X0mQ51CFVLNM6JQYLbd/lotG5/Tw="; patches = [ # Use availability checks to fall back to older APIs on older macOS versions. @@ -87,6 +89,9 @@ mkAppleDerivation { postPatch = '' # Replace hard-coded, impure system paths with the output path in the store. sed -e "s|PATH=[^;]*|PATH='$out/bin'|" -i "pagesize/pagesize.sh" + + # Requires BackgroundTaskManagement.framework headers. + sed -e '/ if (os_feature_enabled(cronBTMToggle, cronBTMCheck))/,/ }/d' -i atrun/atrun.c ''; preConfigure = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 7dc2ce95ffcb..d158be455199 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -96,8 +96,8 @@ "version": "319.0.1" }, "system_cmds": { - "hash": "sha256-qFp9nkzsq9uQ7zoyfvO+3gvDlc7kaPvn6luvmO/Io30=", - "version": "970.0.4" + "hash": "sha256-SZfgMX0znyESzRNNzqyq/FAa9NQeI+5yiBS2xIvsP5g=", + "version": "1012" }, "text_cmds": { "hash": "sha256-KSebU7ZyUsPeqn51nzuGNaNxs9pvmlIQQdkWXIVzDxw=",