unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#68102] [PATCH] gnu: swaylock: Fix cross-compiling.
@ 2023-12-29 12:31 Zheng Junjie
  2023-12-29 18:50 ` bug#68102: " Mathieu Othacehe
  0 siblings, 1 reply; 2+ messages in thread
From: Zheng Junjie @ 2023-12-29 12:31 UTC (permalink / raw)
  To: 68102

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1986 bytes --]

* 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@wilsonb.com>
 ;;; Copyright © 2020 Niklas Eklund <niklas.eklund@posteo.net>
 ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
-;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021,2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
 ;;; Copyright © 2021 lasnesne <lasnesne@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





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#68102: [PATCH] gnu: swaylock: Fix cross-compiling.
  2023-12-29 12:31 [bug#68102] [PATCH] gnu: swaylock: Fix cross-compiling Zheng Junjie
@ 2023-12-29 18:50 ` Mathieu Othacehe
  0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Othacehe @ 2023-12-29 18:50 UTC (permalink / raw)
  To: Zheng Junjie; +Cc: 68102-done


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

Thanks,

Mathieu




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-12-29 18:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-29 12:31 [bug#68102] [PATCH] gnu: swaylock: Fix cross-compiling Zheng Junjie
2023-12-29 18:50 ` bug#68102: " Mathieu Othacehe

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).