From fdb491f2a4fbeb2bc347acc2a4b1a7d207a9319c Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Sun, 10 Dec 2023 00:33:27 +0100 Subject: [PATCH] Work on Hyprland --- zilti/packages/hyprland.scm | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm index 040afa6..4711c60 100644 --- a/zilti/packages/hyprland.scm +++ b/zilti/packages/hyprland.scm @@ -127,22 +127,27 @@ rasterisation.") (build-system meson-build-system) (arguments `(#:configure-flags - '("-Dbackends=drm") + '("-Dlibinput-backend=enabled" + "-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")))))))) + (modify-phases + %standard-phases + (add-before 'configure 'pre-configure + (lambda* (#:key outputs #:allow-other-keys) + (system "pkg-config --list-all"))) + (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 @@ -170,6 +175,8 @@ rasterisation.") `(,hwdata "pnp") cmake hwdata + mesa-headers + vulkan-header pkg-config wayland (if (%current-target-system)