From 645f72f5f2f21f71ff0e25c3de67d0d365ab9878 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Sat, 9 Dec 2023 21:17:15 +0100
Subject: [PATCH] Work on Hyprland

---
 zilti/packages/hyprland.scm | 67 +++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm
index 8f223b4..040afa6 100644
--- a/zilti/packages/hyprland.scm
+++ b/zilti/packages/hyprland.scm
@@ -29,6 +29,8 @@
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages rust)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages vulkan)
   #:use-module (gnu packages wm)
   #:use-module (gnu packages xorg))
 
@@ -75,27 +77,6 @@ Each database is contained in a specific package output, such as the
     (license (list license:gpl2+
                    license:expat)))) ;XFree86 1.0
 
-(define-public libdisplay-info
-  (package
-    (name "libdisplay-info")
-    (version "0.1.1")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-              (url "https://gitlab.freedesktop.org/emersion/libdisplay-info")
-              (commit "0.1.1")))
-        (file-name (git-file-name name version))
-        (sha256 (base32 "1ffq7w1ig1y44rrmkv1hvfjylzgq7f9nlnnsdgdv7pmcpfh45pgf"))))
-    (native-inputs
-     (list pkg-config edid-decode hwdata python-wrapper))
-    (inputs (list python))
-    (build-system meson-build-system)
-    (home-page "https://gitlab.freedesktop.org/emersion/libdisplay-info")
-    (synopsis "Hello, GNU world: An example GNU package")
-    (description "EDID and DisplayID library")
-    (license license:expat)))
-
 (define-public pixman
   (package
     (name "pixman")
@@ -130,7 +111,7 @@ rasterisation.")
     (home-page "http://www.pixman.org/")
     (license license:expat)))
 
-(define-public wlroots
+(define-public wlroots-0.17
   (package
     (name "wlroots")
     (version "0.17.0")
@@ -165,11 +146,18 @@ rasterisation.")
     (propagated-inputs
      (list ;; As required by wlroots.pc.
            eudev
-           libinput-minimal
+           ffmpeg-4
            libxkbcommon
            mesa
            pixman
+           libcap
+           libdisplay-info
+           libinput
+           libpng
            libseat
+           libxkbcommon
+           mesa
+           vulkan-loader
            wayland
            wayland-protocols
            xcb-util-errors
@@ -238,10 +226,36 @@ Wayland compositor based on wlroots") (description "Hyprland.")
    (description "Disassembler")
    (license license:bsd-2)))
 
+(define-public libdisplay-info
+  (package
+   (name "libdisplay-info")
+   (version "0.1.1")
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+           (url "https://gitlab.freedesktop.org/emersion/libdisplay-info")
+           (commit version)))
+     (sha256
+      (base32 "1ffq7w1ig1y44rrmkv1hvfjylzgq7f9nlnnsdgdv7pmcpfh45pgf"))))
+   (build-system meson-build-system)
+   (arguments
+    `(#:phases (modify-phases %standard-phases
+                              (delete 'check))))
+   (native-inputs
+    (list pkg-config
+          edid-decode
+          hwdata
+          python-wrapper))
+   (home-page "https://gitlab.freedesktop.org/emersion/libdisplay-info")
+   (synopsis "EDID and DisplayID library")
+   (description "EDID and DisplayID library")
+   (license license:expat)))
+
 (define-public hyprland
   (package
    (name "hyprland")
-   (version "0.32.3")
+   (version "0.33.1")
    (source
     (origin
      (method git-fetch)
@@ -250,7 +264,7 @@ Wayland compositor based on wlroots") (description "Hyprland.")
 	   (commit (string-append "v" version))))
      (file-name (git-file-name name version))
      (sha256
-      (base32 "17h8gy7wvsxg1ypq70b0cldz6h599xi7fibawlm2g6cvxkmzdwzh"))
+      (base32 "1b4d6r68cqx09blf5xdr1c23hw7axr8sx21wsxjjygqrhkkabdx7"))
      (modules '((guix build utils)))
      (snippet
       #~(begin
@@ -283,6 +297,7 @@ Wayland compositor based on wlroots") (description "Hyprland.")
 	  glu
           glfw
 	  hyprland-protocols
+          libdisplay-info
 	  libglvnd
 	  libinput
 	  libxkbcommon
@@ -293,7 +308,7 @@ Wayland compositor based on wlroots") (description "Hyprland.")
 	  pango
 	  pciutils
 	  udis86
-	  wlroots
+	  wlroots-0.17
 	  xcb-util))
    (home-page "https://www.hyprland.org")
    (synopsis "Dynamic tiling