From 089b42ea867f297e61db29ef7ed56652745b2d99 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 1 Nov 2024 10:56:33 -0500 Subject: [PATCH] tabby: darwin sdk refactor Use macos 15 since upstream CI is tied to macos-latest github action runner. --- pkgs/by-name/ta/tabby/package.nix | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 03179482b4d8..273387813e11 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -13,17 +13,15 @@ llama-cpp, + apple-sdk_15, autoAddDriverRunpath, + versionCheckHook, + cudaSupport ? config.cudaSupport, - rocmSupport ? config.rocmSupport, - - darwin, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64, - # one of [ null "cpu" "rocm" "cuda" "metal" ]; acceleration ? null, - versionCheckHook, }: let @@ -106,19 +104,9 @@ let # TODO(ghthor): some of this can be removed darwinBuildInputs = [ llamaccpPackage ] - ++ optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Foundation - Accelerate - CoreVideo - CoreGraphics - ] - ++ optionals enableMetal [ - Metal - MetalKit - ] - ); + ++ optionals stdenv.hostPlatform.isDarwin ([ + apple-sdk_15 + ]); cudaBuildInputs = [ llamaccpPackage ]; rocmBuildInputs = [ llamaccpPackage ];