From 51051941487470b1546c8ef19acb6e20e34bcd06 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Wed, 20 Mar 2024 19:03:26 +0100
Subject: [PATCH] .

---
 zilti/packages/hyprland.scm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm
index ef2c9d0..ed0b5c1 100644
--- a/zilti/packages/hyprland.scm
+++ b/zilti/packages/hyprland.scm
@@ -127,7 +127,7 @@ and Matrox.")
           ((#:configure-flags flags)
            '(list "--disable-glx"))))))))
 
-(define-public mesa ;; SENT to Guix
+(define-public mesa-24 ;; SENT to Guix
   (package
     (name "mesa")
     (version "24.0.3")
@@ -409,6 +409,25 @@ device drivers allows Mesa to be used in many different environments ranging
 from software emulation to complete hardware acceleration for modern GPUs.")
     (license license:x11)))
 
+(define-public mesa-headers-24
+  (package/inherit mesa-24
+    (name "mesa-headers")
+    (propagated-inputs '())
+    (inputs '())
+    (native-inputs '())
+    (outputs '("out"))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (copy-recursively "include" (string-append
+                                          (assoc-ref outputs "out")
+                                          "/include")))))))))
+
 (define-public glu ;; SENT to Guix
   (package
    (name "glu")
@@ -1068,12 +1087,9 @@ Wayland compositor based on wlroots") (description "Hyprland.")
                                    (system "cat src/meson.build"))))))
    (native-inputs
     (list gcc-13
-          cmake
 	  jq
 	  git
-	  ninja
-	  mesa-headers
-	  meson
+	  mesa-headers-24
 	  pkg-config))
    (inputs
     (list cairo-1.18.0
@@ -1088,10 +1104,11 @@ Wayland compositor based on wlroots") (description "Hyprland.")
 	  libinput-1.25
 	  libxkbcommon
 	  libdrm-2.4.120
-	  mesa
+	  mesa-24
           tomlplusplus
 	  wayland
 	  wayland-protocols
+          xorg-server-xwayland
 	  pango
 	  pciutils
 	  udis86