GNU bug report logs - #68102
[PATCH] gnu: swaylock: Fix cross-compiling.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68102 in the body.
You can then email your comments to 68102 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: swaylock: Fix cross-compiling.
Date: Fri, 29 Dec 2023 20:31:41 +0800

* gnu/packages/wm.scm (swaylock)
[native-inputs]: When cross-compiling, add pkg-config-for-build wayland.
[inputs]: When cross-compiling, add wayland-protocols.

Change-Id: I24274502375f51411576642d87496b8be2e42c45
---
 gnu/packages/wm.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 82ef67a2e4..4e9a7d0137 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -41,7 +41,7 @@
 ;;; Copyright © 2020 B. Wilson <elaexuotee <at> wilsonb.com>
 ;;; Copyright © 2020 Niklas Eklund <niklas.eklund <at> posteo.net>
 ;;; Copyright © 2020 Robert Smith <robertsmith <at> posteo.net>
-;;; Copyright © 2021 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2021,2023 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus <at> gmail.com>
 ;;; Copyright © 2021 qblade <qblade <at> protonmail.com>
 ;;; Copyright © 2021 lasnesne <lasnesne <at> lagunposprasihopre.org>
@@ -1845,8 +1845,14 @@ (define-public swaylock
        (sha256
         (base32 "03jrjwlwxkcyd6m9a1bbwapasnz7b7aws7h0y6jigjm4m478phv6"))))
     (build-system meson-build-system)
-    (inputs (list cairo gdk-pixbuf libxkbcommon linux-pam wayland))
-    (native-inputs (list pango pkg-config scdoc wayland-protocols))
+    (inputs (append (if (%current-target-system)
+                        (list wayland-protocols)
+                        '())
+                    (list cairo gdk-pixbuf libxkbcommon linux-pam wayland)))
+    (native-inputs (append (if (%current-target-system)
+                               (list pkg-config-for-build wayland)
+                               '())
+                           (list pango pkg-config scdoc wayland-protocols)))
     (home-page "https://github.com/swaywm/sway")
     (synopsis "Screen locking utility for Wayland compositors")
     (description "Swaylock is a screen locking utility for Wayland compositors.")

base-commit: f90d6adec787187f7929159e3327c73245d3bbe3
-- 
2.41.0

Message #10 received at 68102-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 68102-done <at> debbugs.gnu.org
Subject: Re: [bug#68102] [PATCH] gnu: swaylock: Fix cross-compiling.
Date: Fri, 29 Dec 2023 19:50:20 +0100

> +;;; Copyright 2021,2023 Zheng Junjie <873216071 <at> qq.com>
                     ^
I added a missing space and applied,

Thanks,

Mathieu

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.