From 94b4848636ecdd398ddf1e0c9dd351eda352752f Mon Sep 17 00:00:00 2001
From: cmacrae <hi@cmacr.ae>
Date: Thu, 30 Apr 2020 17:52:16 +0100
Subject: [PATCH 1/2] maintainers: add cmacrae

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 35dd144796e2..595d3c332c31 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1480,6 +1480,12 @@
     githubId = 848609;
     name = "Michael Bishop";
   };
+  cmacrae = {
+    email = "hi@cmacr.ae";
+    github = "cmacrae";
+    githubId = 3392199;
+    name = "Calum MacRae";
+  };
   cmcdragonkai = {
     email = "roger.qiu@matrix.ai";
     github = "cmcdragonkai";

From 8e8459921a4e2531abe3e86bbd3810b7e71a4735 Mon Sep 17 00:00:00 2001
From: cmacrae <hi@cmacr.ae>
Date: Thu, 30 Apr 2020 17:55:35 +0100
Subject: [PATCH 2/2] yabai: init at 2.4.3

---
 pkgs/os-specific/darwin/yabai/default.nix | 32 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  5 ++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/yabai/default.nix

diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix
new file mode 100644
index 000000000000..aa10a3a20f74
--- /dev/null
+++ b/pkgs/os-specific/darwin/yabai/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }:
+
+stdenv.mkDerivation rec {
+  pname = "yabai";
+  version = "2.4.3";
+
+  src = fetchFromGitHub {
+    owner = "koekeishiya";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1a6pqms5kwdsvr9vcshfa000xf2f5a2qbp5qapx0b3wzclnchjbn";
+  };
+
+  buildInputs = [ Carbon Cocoa ScriptingBridge ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1/
+    cp ./bin/yabai $out/bin/yabai
+    cp ./doc/yabai.1 $out/share/man/man1/yabai.1
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      A tiling window manager for macOS based on binary space partitioning
+    '';
+    homepage = https://github.com/koekeishiya/yabai;
+    platforms = platforms.darwin;
+    maintainers = [ maintainers.cmacrae ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66599002d5fe..e9b894a039a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26111,6 +26111,11 @@ in
 
   xzoom = callPackage ../tools/X11/xzoom {};
 
+  yabai = callPackage ../os-specific/darwin/yabai {
+    inherit (darwin.apple_sdk.frameworks)
+      Carbon Cocoa ScriptingBridge;
+  };
+
   yabause = libsForQt5.callPackage ../misc/emulators/yabause {
     freeglut = null;
     openal = null;