From e0cf96b02baed2d951b14a6bf030da3ddeb7153b Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 21 Sep 2024 23:34:06 -0400
Subject: [PATCH] darwin.diskdev_cmds: 593 -> 735

https://github.com/apple-oss-distributions/diskdev_cmds/compare/diskdev_cmds-593...diskdev_cmds-735
---
 .../darwin/apple-source-releases/diskdev_cmds/meson.build.in | 5 ++++-
 .../darwin/apple-source-releases/diskdev_cmds/package.nix    | 2 +-
 pkgs/os-specific/darwin/apple-source-releases/versions.json  | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/meson.build.in
index 7e9e143d8186..719f602ec60d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/meson.build.in
@@ -2,7 +2,7 @@
 # See: https://github.com/apple-oss-distributions/diskdev_cmds/blob/main/diskdev_cmds.xcodeproj/project.pbxproj
 
 # Project settings
-project('diskdev_cmds', 'c', version : '@version@')
+project('diskdev_cmds', 'c', 'objc', version : '@version@')
 
 
 # Dependencies
@@ -23,6 +23,7 @@ libdisk = declare_dependency(
             'disklib/dkdisklabel.c',
             'disklib/dkopen.c',
             'disklib/dksecsize.c',
+            'disklib/fskit_support.m',
             'disklib/preen.c',
             'disklib/vfslist.c',
         ],
@@ -30,6 +31,8 @@ libdisk = declare_dependency(
 )
 
 # Binaries
+# Note: newfs_fskit and fsck_fskit require private entitlements. They are not built.
+
 executable(
     'dev_mkdb',
     install : true,
diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/package.nix
index 81f2b465906f..9487eb189c85 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/package.nix
@@ -47,7 +47,7 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-Y4Lrr6gtbMj6+HDqmT5A+t59EIE5u780+0fLKoXaiIo=";
+  xcodeHash = "sha256-P2dg3B5pU2ayasMHIM5nI0iG+YDdYQNcEpnJzZxm1kw=";
 
   postPatch =
     # Fix incompatible pointer to integer conversion. The last parameter is size_t not a pointer.
diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json
index 748582fb43b8..a1ff9ff5f1ce 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/versions.json
+++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json
@@ -36,8 +36,8 @@
     "version": "79"
   },
   "diskdev_cmds": {
-    "hash": "sha256-VX+hcZ7JhOA8EhwLloPlM3Yx79RXp9OYHV9Mi10uw3Q=",
-    "version": "593"
+    "hash": "sha256-TebggzBS/HwEP3W2w2p+XvPDxsQtdTbtKEn9wik653Q=",
+    "version": "735"
   },
   "file_cmds": {
     "hash": "sha256-JYy6HwmultKeZtLfaysbsyLoWg+OaTh7eJu54JkJC0Q=",