From 3022a8499915a789dc3b17e2eb13290fc00754e3 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Tue, 30 Apr 2024 21:26:17 +0200
Subject: [PATCH] .

---
 zilti/packages/hyprland.scm | 96 ++++++++++++++++++++++++++-----------
 zilti/packages/pharo.scm    |  3 +-
 2 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm
index 6f4f36f..297660a 100644
--- a/zilti/packages/hyprland.scm
+++ b/zilti/packages/hyprland.scm
@@ -192,6 +192,37 @@ and libliftoff will pick hardware planes for these layers if possible.")
 
 ;;; Low-level Hyprland stuff
 
+(define-public wlroots-hyprland
+  (package
+   (inherit wlroots)
+   (name "wlroots-hyprland")
+   (version "0.39.1")
+   (source
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/hyprwm/wlroots-hyprland")
+       (commit "5c1d51c5a2793480f5b6c4341ad0797052aec2ea")))
+     (sha256
+      (base32
+       "0gy0g0kxb3q1wjqrypnvmrxcb4ld3advikchygpwpfp4s9v0mmvd"))))
+   (build-system meson-build-system)
+   (native-inputs
+    (modify-inputs
+     (package-inputs wlroots)
+     (replace "hwdata" hwdata-for-hyprland)
+     (prepend pkg-config)
+     (append utils:cmake)
+     (append gcc-13)
+     (append git)))
+   (propagated-inputs
+    (modify-inputs
+     (package-propagated-inputs wlroots)
+     (prepend libdrm-for-hyprland)
+     (replace "libinput-minimal" libinput-minimal-1.24.0)
+     (replace "wayland-protocols" wayland-protocols-for-hyprland)))))
+
 (define-public hyprcursor
   (package
    (inherit rosenthal:hyprcursor)
@@ -296,6 +327,7 @@ and libliftoff will pick hardware planes for these layers if possible.")
           pango
           pciutils
           tomlplusplus
+          wlroots-hyprland
           wayland
           wayland-protocols-for-hyprland))
    (home-page "https://hyprland.org")
@@ -345,13 +377,15 @@ more.")
    (name "hyprland-official-plugin")
    (version "e9457e08ca3ff16dc5a815be62baf9e18b539197")
    (source
-    (origin (method git-fetch)
-            (uri (git-reference
-                  (url "https://github.com/hyprwm/hyprland-plugins")
-                  (commit version)))
-            (sha256
-             (base32
-              "0rnn5mr8yy98nyyy6q7l12jpr5gzs2904ywypy89p52fzxxb5zm9"))))
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/hyprwm/hyprland-plugins")
+       (commit version)))
+     (sha256
+      (base32
+       "0rnn5mr8yy98nyyy6q7l12jpr5gzs2904ywypy89p52fzxxb5zm9"))))
    (build-system meson-build-system)
    (propagated-inputs
     (list hyprland
@@ -466,14 +500,15 @@ more.")
    (name "hyprland-plugin-hyprsplit")
    (version "6b9db62fab91066bb678f14198771b8e8cc12a8f")
    (source
-    (origin (method git-fetch)
-            (uri
-             (git-reference
-              (url "https://github.com/shezdy/hyprsplit.git")
-              (commit version)))
-            (sha256
-             (base32
-              "1zh5x83nfr5893snnz38kmxvj31m8n8pgjdd0759amm41f4gw3ia"))))
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/shezdy/hyprsplit.git")
+       (commit version)))
+     (sha256
+      (base32
+       "1zh5x83nfr5893snnz38kmxvj31m8n8pgjdd0759amm41f4gw3ia"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -509,8 +544,9 @@ more.")
    (inherit hyprland-plugin-hyprsplit)
    (name "hyprland-xwayland-plugin-hyprsplit")
    (propagated-inputs
-    (modify-inputs (package-propagated-inputs hyprland-plugin-hyprsplit)
-                   (replace "hyprland" hyprland-xwayland)))))
+    (modify-inputs
+     (package-propagated-inputs hyprland-plugin-hyprsplit)
+     (replace "hyprland" hyprland-xwayland)))))
 
 ;;; Hypr Ecosystem
 
@@ -576,28 +612,32 @@ more.")
    (name "hyprpicker")
    (version "0.2.0")
    (source
-    (origin (method git-fetch)
-            (uri (git-reference
-                  (url "https://github.com/hyprwm/hyprpicker")
-                  (commit (string-append "v" version))))
-            (file-name
-             (git-file-name name version))
-            (sha256
-             (base32
-              "12wkvwdxbv6ni292575vg3j06qdmljw5mydh8i4x2qrfpi5kqavg"))))
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/hyprwm/hyprpicker")
+       (commit
+        (string-append "v" version))))
+     (file-name
+      (git-file-name name version))
+     (sha256
+      (base32
+       "12wkvwdxbv6ni292575vg3j06qdmljw5mydh8i4x2qrfpi5kqavg"))))
    (build-system cmake-build-system)
    (native-inputs
     (list utils:cmake
           pkg-config))
-   (inputs
+   (propagated-inputs
     (list cairo
           hyprland
           rosenthal:hyprland-protocols
           pango
           libjpeg-turbo
           libxkbcommon
+          wayland
           wayland-protocols-for-hyprland
-          wayland))
+          wlroots-hyprland))
    (home-page "https://github.com/hyprwm/hyprpicker")
    (synopsis "A wlroots-compatible Wayland color picker that does not suck")
    (description "A wlroots-compatible Wayland color picker that does not suck.")
diff --git a/zilti/packages/pharo.scm b/zilti/packages/pharo.scm
index 2636878..8d35203 100644
--- a/zilti/packages/pharo.scm
+++ b/zilti/packages/pharo.scm
@@ -75,7 +75,8 @@
    (description "This is the VM used by Pharo.")
    (license license:expat)))
 
-(define pharo-vm-10.2
+#;
+(define-public pharo-vm-10.2
   (package
    (name "pharo-vm")
    (version "10.2.0")