diff mbox series

[bug#68102] gnu: swaylock: Fix cross-compiling.

Message ID 8e34a85422d535bf3acb4dfac643ed559661ddd4.1703853088.git.zhengjunjie@iscas.ac.cn
State New
Headers show
Series [bug#68102] gnu: swaylock: Fix cross-compiling. | expand

Commit Message

Zheng Junjie Dec. 29, 2023, 12:31 p.m. UTC 
* 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(-)


base-commit: f90d6adec787187f7929159e3327c73245d3bbe3

Comments

Mathieu Othacehe Dec. 29, 2023, 6:50 p.m. UTC | #1 
> +;;; Copyright 2021,2023 Zheng Junjie <873216071@qq.com>
                     ^
I added a missing space and applied,

Thanks,

Mathieu
diff mbox series

Patch

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.")