Subject: bug#57430: closed (Re: bug#57430: [PATCH] gnu: wayland-protocols: Fix cross-compilation)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 30 Aug 2022 07:19:01 +0000

Your bug report

#57430: [PATCH] gnu: wayland-protocols: Fix cross-compilation

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
57430: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57430
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#57430: [PATCH] gnu: wayland-protocols: Fix cross-compilation
From: Mathieu Othacehe <[email-masked]>
To: Tobias Kortkamp <[email-masked]>
Cc: [email-masked], [email-masked]
Date: Tue, 30 Aug 2022 09:18:30 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello Tobias,

> * gnu/packages/freedesktop.scm (wayland-protocols): Fix cross-compilation
> [native-inputs]: Add pkg-config-for-build and wayland.

Maxime's idea of setting #target to false is interesting but let's go
with your original patch because it's the way we handle things in
general.

Thanks,

Mathieu

Subject: [PATCH] gnu: wayland-protocols: Fix cross-compilation
From: Tobias Kortkamp <[email-masked]>
To: [email-masked]
Cc: Tobias Kortkamp <[email-masked]>
Date: Fri, 26 Aug 2022 12:14:58 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/freedesktop.scm (wayland-protocols): Fix cross-compilation
[native-inputs]: Add pkg-config-for-build and wayland.
---
 gnu/packages/freedesktop.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 037a247243..c0a94c6623 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1074,8 +1074,11 @@ (define-public wayland-protocols
     (build-system meson-build-system)
     (inputs
      (list wayland))
-    (native-inputs
-     (list pkg-config python))
+    (native-inputs (cons* pkg-config python
+                          (if (%current-target-system)
+                              (list pkg-config-for-build
+                                    wayland) ; for wayland-scanner
+                              '())))
     (synopsis "Wayland protocols")
     (description "Wayland-Protocols contains Wayland protocols that add
 functionality not available in the Wayland core protocol.  Such protocols either
-- 
2.37.1