guix-commits
[Top][All Lists]
Advanced

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

05/05: gnu: swaylock: Fix cross-compiling.


From: guix-commits
Subject: 05/05: gnu: swaylock: Fix cross-compiling.
Date: Fri, 29 Dec 2023 13:49:58 -0500 (EST)

mothacehe pushed a commit to branch master
in repository guix.

commit a14a94deb218f459dc8a3139ef6e25f15c822463
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Fri Dec 29 20:31:41 2023 +0800

    gnu: swaylock: Fix cross-compiling.
    
    * 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
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 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..a87eb20428 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 @@ corners, shadows, inactive window dimming, etc.")
        (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.")



reply via email to

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