From 4457d955d01a4f8e0187448063e146bc36e4745f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 09:36:52 -0500 Subject: [PATCH] yabai: refactor to new sdk pattern --- pkgs/by-name/ya/yabai/package.nix | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 53834f3cd739..5b3fab50ad70 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - overrideSDK, fetchFromGitHub, fetchzip, installShellFiles, @@ -9,23 +8,12 @@ writeShellScript, common-updater-scripts, curl, - darwin, jq, - xcodebuild, xxd, yabai, + apple-sdk_11, }: -let - inherit (darwin.apple_sdk_11_0.frameworks) - Carbon - Cocoa - ScriptingBridge - SkyLight - ; - - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "yabai"; version = "7.1.4"; @@ -41,15 +29,11 @@ stdenv'.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ - xcodebuild xxd ]; buildInputs = lib.optionals stdenv.hostPlatform.isx86_64 [ - Carbon - Cocoa - ScriptingBridge - SkyLight + apple-sdk_11 ]; dontConfigure = true;