From f955d78e27ecfc7f66d3d141a309de2d77095747 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 28 Dec 2022 15:00:47 +0100
Subject: [PATCH] hypr: unbreak on darwin

---
 .../window-managers/hyprwm/hypr/default.nix      | 16 +++++++++++++++-
 pkgs/top-level/all-packages.nix                  |  4 +++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 673fa90c5005..2485552fce6e 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cairo
 , cmake
 , glib
@@ -15,6 +16,7 @@
 , xcbutilcursor
 , xcbutilkeysyms
 , xcbutilwm
+, xcbutil
 , xmodmap
 }:
 
@@ -31,6 +33,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./000-dont-set-compiler.diff
+    # TODO: remove on next release
+    (fetchpatch {
+      url = "https://github.com/hyprwm/Hypr/commit/08d6af2caf882247943f0e8518ad782f35d1aba4.patch";
+      sha256 = "sha256-WjR12ZH8CE+l9xSeQUAPYW5r5HzoPpod5YqDPJTdTY8=";
+    })
+    (fetchpatch {
+      url = "https://github.com/hyprwm/Hypr/commit/7512a3ab91865b1e11b8c4a9dfdffb25c2b153de.patch";
+      sha256 = "sha256-0Hq5n115z0U44op7A1FO9tUOeMEPV0QgD5E5zcmend0=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -51,8 +62,12 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutilcursor
     xcbutilkeysyms
     xcbutilwm
+    xcbutil
   ];
 
+  # src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-c++11-narrowing";
+
   installPhase = ''
     runHook preInstall
 
@@ -71,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.bsd3;
     maintainers = with maintainers; [ AndersonTorres ];
     inherit (libX11.meta) platforms;
-    broken = stdenv.isDarwin; # xcb/xcb_atom.h not found
     mainProgram = "Hypr";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b260e9ac45a..24a128ffe629 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4764,7 +4764,9 @@ with pkgs;
 
   hunt = callPackage ../tools/misc/hunt { };
 
-  hypr = callPackage ../applications/window-managers/hyprwm/hypr { };
+  hypr = callPackage ../applications/window-managers/hyprwm/hypr {
+    cairo = cairo.override { xcbSupport = true; };
+  };
 
   hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
     stdenv = gcc11Stdenv;