diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/copyfile/meson.build.in index d0e612d986f4..79ea8d5bf7ce 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/meson.build.in @@ -14,6 +14,8 @@ library( 'copyfile', c_args : [ '-D__DARWIN_NOW_CANCELABLE=1', + # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/clonefile.h#L35 + '-DCLONE_ACL=0x0004', # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/kdebug.h#L691 '-DDBG_DECMP=0x12', # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/libkern/os/base.h#L129 diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix index 8b47ecd3b6c0..29b41f60b054 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix @@ -73,7 +73,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-RClwLwWuieJzKJl1YRCrGBxPgWy0MDwFwN1VZ4GBxGY="; + xcodeHash = "sha256-SYW6pBlCQkcbkBqCq+W/mDYZZ7/co2HlPZwXzgh/LnI="; postPatch = '' # Disable experimental bounds safety stuff that’s not available in LLVM 16. @@ -82,6 +82,10 @@ mkAppleDerivation { --replace-fail '__ptrcheck_abi_assume_single()' "" \ --replace-fail '__unsafe_indexable' "" done + + # clang 16 does not support C23 empty initializers. This can be removed once the bootstrap tools are updated. + substituteInPlace copyfile.c \ + --replace-fail 'filesec_t fsec_tmp = {};' 'filesec_t fsec_tmp = {0};' ''; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index e9b1d5d3817b..be9b0fa4744d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -28,8 +28,8 @@ "version": "136" }, "copyfile": { - "hash": "sha256-uHqLFOIpXK+n0RHyOZzVsP2DDZcFDivKCnqHBaXvHns=", - "version": "138" + "hash": "sha256-lIhl5sr1gewIHkh10hD+H/I7MVPzlHlONGRMOO7OZuA=", + "version": "213" }, "developer_cmds": { "hash": "sha256-h0wMVlS6QdRvKOVJ74W9ziHYGApjvnk77AIR6ukYBRo=",