From d35c7590a2b06f6c6d2eac22b4fb833ca6023b66 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 2 Mar 2018 19:45:38 +0100
Subject: khd: 2.1.1 -> 3.0.0

---
 pkgs/os-specific/darwin/khd/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index 8a2f4f46e03f..fb7bb12a493f 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchFromGitHub, Carbon, Cocoa }:
+{ stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }:
 
 stdenv.mkDerivation rec {
   name = "khd-${version}";
-  version = "2.1.1";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "khd";
     rev = "v${version}";
-    sha256 = "1ijfrlnwdf8hk259j3jfxj6zizvqzj57458rflza626z5dnhmbpr";
+    sha256 = "0nzfhknv1s71870w2dk9dy56a3g5zsbjphmfrz0vsvi438g099r4";
   };
 
+  patches = [
+    # Fixes build issues, remove with >3.0.0
+    (fetchpatch {
+      url = https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch;
+      sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np";
+    })
+  ];
+
   buildInputs = [ Carbon Cocoa ];
 
   buildPhase = ''
-- 
cgit 1.4.1


From 9717e6268f881017617b494e67bfc00e337218b0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 2 Mar 2018 19:46:12 +0100
Subject: kwm: 4.0.4 -> 4.0.5

---
 pkgs/os-specific/darwin/kwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix
index ac231f2dfe3d..3076392ecb26 100644
--- a/pkgs/os-specific/darwin/kwm/default.nix
+++ b/pkgs/os-specific/darwin/kwm/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "kwm-${version}";
-  version = "4.0.4";
+  version = "4.0.5";
 
   src = fetchzip {
     stripRoot = false;
     url = "https://github.com/koekeishiya/kwm/releases/download/v${version}/Kwm-${version}.zip";
-    sha256 = "07rf4ichq511w8qmvd6s602s7xcyjhjp73d5c615sj82cxvgirwc";
+    sha256 = "1ld1vblg3hmc6lpb8p2ljvisbkijjkijf4y87z5y1ia4k8pk7mxb";
   };
 
   # TODO: Build this properly once we have swiftc.
-- 
cgit 1.4.1