From 7980f52d0c357338de269ee1b7138f901936942f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 5 Dec 2021 19:15:43 +0100 Subject: [PATCH] yabai: 3.3.4 -> 3.3.10 --- pkgs/os-specific/darwin/yabai/default.nix | 15 +++++++++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index b371e97d06fc..5a3daed9fff8 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -1,17 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, xxd }: +{ lib, stdenv, fetchFromGitHub, darwin, xxd }: stdenv.mkDerivation rec { pname = "yabai"; - version = "3.3.4"; + version = "3.3.10"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "1pvyjdxgy7yxxz4x87f8an0dlxvxbnmv5kya8hkzw2na453ihvab"; + sha256 = "sha256-8O6//T894C32Pba3F2Z84Z6VWeCXlwml3xsXoIZGqL0="; }; - buildInputs = [ Carbon Cocoa ScriptingBridge xxd ]; + nativeBuildInputs = [ xxd ]; + + buildInputs = with darwin.apple_sdk.frameworks; [ + Carbon + Cocoa + ScriptingBridge + SkyLight + ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afb7780e6268..c559034c9ef2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33415,9 +33415,7 @@ with pkgs; xzoom = callPackage ../tools/X11/xzoom {}; - yabai = callPackage ../os-specific/darwin/yabai { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge; - }; + yabai = callPackage ../os-specific/darwin/yabai { }; yabause = libsForQt5.callPackage ../misc/emulators/yabause { freeglut = null;