From b0e2c787ba58b6a1f1955b772040e312aeca4139 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 29 Sep 2024 21:54:14 -0400
Subject: [PATCH] moltenvk: use xcbuildHook

When using structured attrs, xcbuildHook supports schemes with spaces in
their names.
---
 pkgs/os-specific/darwin/moltenvk/default.nix | 36 +++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix
index 43ede5f950c5..486a6a9b1f2d 100644
--- a/pkgs/os-specific/darwin/moltenvk/default.nix
+++ b/pkgs/os-specific/darwin/moltenvk/default.nix
@@ -11,7 +11,7 @@
   spirv-headers,
   spirv-tools,
   vulkan-headers,
-  xcbuild,
+  xcbuildHook,
   AppKit,
   Foundation,
   Metal,
@@ -28,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "MoltenVK";
   version = "1.2.9";
 
+  strictDeps = true;
+
   buildInputs = [
     AppKit
     Foundation
@@ -42,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ];
 
-  nativeBuildInputs = [ xcbuild ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   outputs = [
     "out"
@@ -117,25 +119,25 @@ stdenv.mkDerivation (finalAttrs: {
     "-lspirv-cross-reflect"
   ];
 
-  buildPhase = ''
-    runHook preBuild
-
+  preBuild = ''
     NIX_CFLAGS_COMPILE+=" \
       -I$NIX_BUILD_TOP/$sourceRoot/build/include \
       -I$NIX_BUILD_TOP/$sourceRoot/Common"
-
-    xcodebuild build \
-      SYMROOT=$PWD/Products OBJROOT=$PWD/Intermedates \
-      -jobs $NIX_BUILD_CORES \
-      -configuration Release \
-      -project MoltenVKPackaging.xcodeproj \
-      -scheme 'MoltenVK Package (macOS only)' \
-      -destination generic/platform=macOS \
-      -arch ${stdenv.hostPlatform.darwinArch}
-
-    runHook postBuild
   '';
 
+  xcbuildFlags = [
+    "-configuration"
+    "Release"
+    "-project"
+    "MoltenVKPackaging.xcodeproj"
+    "-scheme"
+    "MoltenVK Package (macOS only)"
+    "-destination"
+    "generic/platform=macOS"
+    "-arch"
+    stdenv.hostPlatform.darwinArch
+  ];
+
   postBuild =
     if enableStatic then
       ''
@@ -187,6 +189,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  __structuredAttrs = true;
+
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
     ignoredVersions = ".*-(beta|rc).*";