From cd3a08359dc96f811c3ff2ce1f7d04961c1daf61 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Thu, 31 Oct 2024 23:41:53 +0800 Subject: [PATCH] sketchybar: use the new apple-sdk --- pkgs/by-name/sk/sketchybar/package.nix | 31 +++++--------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index e0e2a004e6d78..9058a11589b28 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -1,37 +1,23 @@ { lib, - overrideSDK, stdenv, - darwin, fetchFromGitHub, + apple-sdk_11, + darwinMinVersionHook, testers, nix-update-script, }: let inherit (stdenv.hostPlatform) system; - inherit (darwin.apple_sdk_11_0.frameworks) - AppKit - Carbon - CoreAudio - CoreWLAN - CoreVideo - DisplayServices - IOKit - MediaRemote - SkyLight - ; - target = { "aarch64-darwin" = "arm64"; "x86_64-darwin" = "x86"; } .${system} or (throw "Unsupported system: ${system}"); - - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; version = "2.21.0"; @@ -43,15 +29,8 @@ stdenv'.mkDerivation (finalAttrs: { }; buildInputs = [ - AppKit - Carbon - CoreAudio - CoreWLAN - CoreVideo - DisplayServices - IOKit - MediaRemote - SkyLight + apple-sdk_11 + (darwinMinVersionHook "10.13") ]; makeFlags = [ target ];