From cccbe8a5fb88eb4767d4de882e675bb5891cd8e5 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Wed, 31 Jan 2024 11:40:36 +0100
Subject: [PATCH] .

---
 zilti/packages/hyprland.scm | 172 +++++++++++++++++++++---------------
 1 file changed, 99 insertions(+), 73 deletions(-)

diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm
index 5382ffd..42b0c04 100644
--- a/zilti/packages/hyprland.scm
+++ b/zilti/packages/hyprland.scm
@@ -195,82 +195,108 @@ including drivers for chipsets produced by 3DFX, AMD (formerly ATI), Intel
 and Matrox.")
     (license license:x11)))
 
-(define-public wlroots-master
+(define-public libliftoff
   (package
-   (name "wlroots")
-   (version "fe6f380f2653751e95be6f99922d10bea1327145")
-   (source
-    (origin
-     (method git-fetch)
-     (uri (git-reference
-           (url "https://gitlab.freedesktop.org/wlroots/wlroots")
-           (commit version)))
-     (file-name (git-file-name name version))
-     (sha256
-      (base32
-       "09g8vb9yq8b2nlvrgak197f98qcls5cdbvbva9mgr6spczgkjaxi"))))
-   (build-system meson-build-system)
-   (arguments
-    `(#:configure-flags
-      '("-Dauto_features=enabled")
-      #:phases
-      (modify-phases
-       %standard-phases
-       (add-before 'configure 'hardcode-paths
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     (substitute* "xwayland/server.c"
-                                  (("Xwayland") (string-append (assoc-ref inputs
-                                                                          "xorg-server-xwayland")
-                                                               "/bin/Xwayland")))
-                     #t))
-       (add-before 'configure 'fix-meson-file
-                   (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                     (substitute* "backend/drm/meson.build"
-                                  (("/usr/share/hwdata/pnp.ids")
-                                   (string-append (assoc-ref (or native-inputs inputs) "hwdata")
-                                                  "/share/hwdata/pnp.ids"))))))))
-   (propagated-inputs
-    (list ;; As required by wlroots.pc.
-     eudev
-     ffmpeg-4
-     glslang
-     libxkbcommon
-     mesa
-     pixman
-     libcap
-     libdisplay-info
-     libinput-1.25
-     libpng
-     libseat
-     libxkbcommon
-     mesa
-     vulkan-loader
-     wayland
-     wayland-protocols
-     xcb-util-errors
-     xcb-util-renderutil
-     xcb-util-wm
-     xorg-server-xwayland))
-   (inputs
-    (list libdrm-2.4.120))
-   (native-inputs
-    (cons*
-     `(,hwdata "pnp")
-     cmake
-     hwdata
-     mesa-headers
-     vulkan-headers
-     pkg-config
-     wayland
-     (if (%current-target-system)
-         (list pkg-config-for-build)
-         '())))
-   (home-page "https://gitlab.freedesktop.org/wlroots/wlroots/")
-   (synopsis "Pluggable, composable, unopinionated modules for building a
+    (name "libliftoff")
+    (version "0.4.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.freedesktop.org/emersion/libliftoff")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32
+         "1ikjp638d655ycaqkdnzhb12d29kkbb3a46lqhbhsfc8vsqj3z1l"))))
+    (build-system meson-build-system)
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list libdrm-2.4.120))
+    (home-page "https://gitlab.freedesktop.org/emersion/libliftoff")
+    (synopsis "Lightweight KMS plane library")
+    (description "libliftoff eases the use of KMS planes from userspace without standing in your
+way. Users create \"virtual planes\" called layers, set KMS properties on them,
+and libliftoff will pick hardware planes for these layers if possible.")
+    (license license:expat)))
+
+(define-public wlroots-0.17.1
+  (package
+    (name "wlroots")
+    (version "0.17.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1hj4gq5vx8in65622yvjm8bwqkw2vpc556k9my997a0hn0ricj37"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:configure-flags
+       '("-Dauto_features=enabled")
+       #:phases
+       (modify-phases
+           %standard-phases
+         (add-before 'configure 'hardcode-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "xwayland/server.c"
+               (("Xwayland") (string-append (assoc-ref inputs
+                                                       "xorg-server-xwayland")
+                                            "/bin/Xwayland")))
+             #t))
+         (add-before 'configure 'fix-meson-file
+           (lambda* (#:key native-inputs inputs #:allow-other-keys)
+             (substitute* "backend/drm/meson.build"
+               (("/usr/share/hwdata/pnp.ids")
+                (string-append (assoc-ref (or native-inputs inputs) "hwdata")
+                               "/share/hwdata/pnp.ids"))))))))
+    (propagated-inputs
+     (list ;; As required by wlroots.pc.
+      eudev
+      ffmpeg-4
+      glslang
+      libxkbcommon
+      mesa
+      pixman
+      libcap
+      libdisplay-info
+      libinput-1.25
+      libliftoff
+      libpng
+      libseat
+      libxkbcommon
+      mesa
+      vulkan-loader
+      wayland
+      wayland-protocols
+      xcb-util-errors
+      xcb-util-renderutil
+      xcb-util-wm
+      xorg-server-xwayland))
+    (inputs
+     (list libdrm-2.4.120))
+    (native-inputs
+     (cons*
+      `(,hwdata "pnp")
+      cmake
+      hwdata
+      mesa-headers
+      vulkan-headers
+      pkg-config
+      wayland
+      (if (%current-target-system)
+          (list pkg-config-for-build)
+          '())))
+    (home-page "https://gitlab.freedesktop.org/wlroots/wlroots/")
+    (synopsis "Pluggable, composable, unopinionated modules for building a
 Wayland compositor")
-   (description "wlroots is a set of pluggable, composable, unopinionated
+    (description "wlroots is a set of pluggable, composable, unopinionated
 modules for building a Wayland compositor.")
-   (license license:expat)))  ; MIT license
+    (license license:expat)))  ; MIT license
 
 (define-public hyprland-protocols
   (package