From 76b706c71ce1e1c2a140856a80cdd60bd8d4b0fd Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 15 Oct 2023 13:06:53 +0300
Subject: gnu: wlroots: Fix cross-compiling.

* gnu/packages/wm.scm (wlroots)[arguments]: Adjust custom phases to also
search for files from native-inputs.
[native-inputs]: Add wayland. When cross-compiling add
pkg-config-for-build.
---
 gnu/packages/wm.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/wm.scm')

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index af429916bf..cdc8b57030 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1644,10 +1644,10 @@ functionality to display information about the most commonly used services.")
                                             "/bin/Xwayland")))
              #t))
          (add-before 'configure 'fix-meson-file
-           (lambda* (#:key inputs #:allow-other-keys)
+           (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (substitute* "backend/drm/meson.build"
                (("/usr/share/hwdata/pnp.ids")
-                (string-append (assoc-ref inputs "hwdata")
+                (string-append (assoc-ref (or native-inputs inputs) "hwdata")
                                "/share/hwdata/pnp.ids"))))))))
     (propagated-inputs
      (list ;; As required by wlroots.pc.
@@ -1663,9 +1663,13 @@ functionality to display information about the most commonly used services.")
            xcb-util-wm
            xorg-server-xwayland))
     (native-inputs
-     (list
+     (cons*
        `(,hwdata "pnp")
-       pkg-config))
+       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")
-- 
cgit v1.2.3