guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/23: gnu: libxkbcommon: Fix cross-compilation.


From: guix-commits
Subject: 07/23: gnu: libxkbcommon: Fix cross-compilation.
Date: Sun, 27 Nov 2022 15:26:10 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit 98de78523be8009a13a67f65e4dc3cb5e22a5cea
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Nov 27 14:09:11 2022 +0100

    gnu: libxkbcommon: Fix cross-compilation.
    
    * gnu/packages/xdisorg.scm (libxkbcommon)[native-inputs]: When
    cross-compiling, add PKG-CONFIG-FOR-BUILD and WAYLAND.
---
 gnu/packages/xdisorg.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 1a4d805f19..9cc7cc652a 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -516,7 +516,12 @@ avoiding password prompts when X11 forwarding has already 
been setup.")
            wayland-protocols
            xkeyboard-config))
     (native-inputs
-     (list bison doxygen pkg-config python))
+     (append (list bison doxygen pkg-config python)
+             (if (%current-target-system)
+                 ;; wayland-scanner is required at build time.
+                 ;; TODO: Remove this conditional on core-updates.
+                 (list pkg-config-for-build wayland)
+                 '())))
     (arguments
      `(#:configure-flags
        (list (string-append "-Dxkb-config-root="



reply via email to

[Prev in Thread] Current Thread [Next in Thread]