From 22c26a2ae4339073e2bfcfe6a51fa41c9cfe517c Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Tue, 16 Apr 2024 01:41:29 +0200
Subject: [PATCH] .

---
 zilti/packages/hyprland.scm                      | 15 +++++++++------
 .../patches/zig-0.11-use-LIBRARY_PATH.patch      | 16 +++++-----------
 zilti/packages/zig.scm                           |  2 +-
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm
index e40577b..196fce5 100644
--- a/zilti/packages/hyprland.scm
+++ b/zilti/packages/hyprland.scm
@@ -396,21 +396,25 @@ more.")
     (list
      #:configure-flags #~(list
                           "-Dcpp_std=none"
-                          (string-append "-Dcpp_args=-std=gnu++2b"
-                                         " -I" #$(file-append wlroots-hyprland "/include")))
+                          "-Dcpp_args=-std=gnu++2b")
      #:phases #~(modify-phases %standard-phases
                                (delete 'check))))
+   (propagated-inputs
+    (list hyprland-xwayland
+          wayland))
    (native-inputs
     (list utils:cmake
           gcc-13
-          pkg-config
-          wlroots-hyprland))
+          pkg-config))
    (inputs
     (list cairo-for-hyprland
-          hyprland
           hyprlang
           libdrm-for-hyprland
           libinput
+          libxkbcommon
+          xcb-util
+          xcb-util-wm
+          mesa
           pixman))
    (home-page "https://github.com/shezdy/hyprsplit")
    (synopsis "hyprland plugin for separate sets of workspaces on each monitor")
@@ -462,7 +466,6 @@ more.")
           mesa
           rosenthal:hyprland-protocols
           wayland-protocols-for-hyprland
-          wlroots-hyprland
           file
           libglvnd
           libjpeg-turbo
diff --git a/zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch b/zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch
index 67ca53e..8af4193 100644
--- a/zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch
+++ b/zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch
@@ -1,32 +1,26 @@
 diff -crB zig.orig/CMakeLists.txt zig/CMakeLists.txt
 *** zig.orig/CMakeLists.txt	2024-04-16 00:59:10.664981173 +0200
---- zig/CMakeLists.txt	2024-04-16 01:01:00.747848186 +0200
+--- zig/CMakeLists.txt	2024-04-16 01:38:47.686554540 +0200
 ***************
 *** 904,909 ****
---- 904,919 ----
+--- 904,912 ----
     set(ZIG_PIE_ARG "")
   endif()
   
 + # Use LIBRARY_PATH
 + string(REPLACE ":" ";" LIBRARY_PATH "$ENV{LIBRARY_PATH}")
-+ set(SEARCH_PATHS "")
-+ 
-+ foreach(PATH ${LIBRARY_PATH})
-+   list(APPEND SEARCH_PATHS "--search-prefix ${PATH}")
-+ endforeach()
-+ 
-+ list(JOIN SEARCH_PATHS " " SEARCH_PREFIXES)
 + 
   # -Dno-langref is currently hardcoded because building the langref takes too damn long
   # To obtain these two forms of documentation, run zig build against stage3 rather than stage2.
   set(ZIG_BUILD_ARGS
 ***************
 *** 919,924 ****
---- 929,935 ----
+--- 922,929 ----
     "-Dtarget=${ZIG_TARGET_TRIPLE}"
     "-Dcpu=${ZIG_TARGET_MCPU}"
     "-Dversion-string=${RESOLVED_ZIG_VERSION}"
-+   "${SEARCH_PREFIXES}"
++   --search-prefix $<JOIN:LIBRARY_PATH," --search-prefix">
++   ${SEARCH_PREFIXES}
   )
   
   add_custom_target(stage3 ALL
diff --git a/zilti/packages/zig.scm b/zilti/packages/zig.scm
index ef26401..93f5b0c 100644
--- a/zilti/packages/zig.scm
+++ b/zilti/packages/zig.scm
@@ -39,7 +39,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (patches (search-patches
-                 "zig-0.11-use-LIBRARY_PATH.patch"))
+                 "zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch"))
        (sha256
         (base32 "0qh7c27cd4wcdjj0mbpkarvwypfk1js8hkyxs0z149qv75zkbrca"))))
     (arguments