summary refs log tree commit diff
path: root/pkgs/os-specific/darwin
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-12-05 22:02:00 -0800
committerJonathan Ringer <jonringer117@gmail.com>2021-12-05 22:02:00 -0800
commit5263fb820e7d21f5db9053659b183ffcaf398f5b (patch)
treee129ad5b5e1cfc90026a294453f33b4d778cb66a /pkgs/os-specific/darwin
parent423aff986c53d465175135ee72c3584c88394de9 (diff)
parent2aaf7277718841775d6c69d7db86e8e8e1d1f678 (diff)
downloadnixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar
nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.gz
nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.bz2
nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.lz
nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.xz
nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.zst
nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.zip
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/django-rq/default.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/darwin')
-rw-r--r--pkgs/os-specific/darwin/yabai/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix
index b371e97d06f..5a3daed9fff 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