From abfa473360471532c547de8b202c780507924d4b Mon Sep 17 00:00:00 2001 From: Kusha Gharahi <3326002+kushagharahi@users.noreply.github.com> Date: Tue, 14 Apr 2026 18:20:20 -0500 Subject: [PATCH] nix: support unified apple-sdk --- .devops/nix/package.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index 0277dda86d..58a1472649 100644 --- a/.devops/nix/package.nix +++ b/.devops/nix/package.nix @@ -13,6 +13,7 @@ cudaPackages, autoAddDriverRunpath, darwin, + apple-sdk ? null, rocmPackages, vulkan-headers, vulkan-loader, @@ -76,15 +77,17 @@ let ''; # apple_sdk is supposed to choose sane defaults, no need to handle isAarch64 - # separately + # separately. + # Modern Nixpkgs (25.05+) provides a unified 'apple-sdk' derivation. + # Legacy Nixpkgs (24.05/24.11) uses 'darwin.apple_sdk.frameworks'. darwinBuildInputs = - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreVideo - CoreGraphics - ] - ++ optionals useMetalKit [ MetalKit ]; + if apple-sdk != null then + # Unified SDK: single package provides all frameworks + [ apple-sdk ] + else + with darwin.apple_sdk.frameworks; + [ Accelerate CoreVideo CoreGraphics ] + ++ lib.optional useMetalKit MetalKit; cudaBuildInputs = with cudaPackages; [ cuda_cudart