From patchwork Fri Dec 29 12:31:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 58156 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3EFFF27BBE9; Fri, 29 Dec 2023 12:33:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 658AD27BBE2 for ; Fri, 29 Dec 2023 12:33:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJC31-0005iE-Vx; Fri, 29 Dec 2023 07:33:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJC2x-0005hC-CI for guix-patches@gnu.org; Fri, 29 Dec 2023 07:33:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJC2w-0007yQ-7U for guix-patches@gnu.org; Fri, 29 Dec 2023 07:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJC2w-00020T-20 for guix-patches@gnu.org; Fri, 29 Dec 2023 07:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68102] [PATCH] gnu: swaylock: Fix cross-compiling. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Dec 2023 12:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68102@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17038531487670 (code B ref -1); Fri, 29 Dec 2023 12:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Dec 2023 12:32:28 +0000 Received: from localhost ([127.0.0.1]:40926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJC2N-0001ze-HO for submit@debbugs.gnu.org; Fri, 29 Dec 2023 07:32:27 -0500 Received: from lists.gnu.org ([2001:470:142::17]:39756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJC2K-0001zN-D2 for submit@debbugs.gnu.org; Fri, 29 Dec 2023 07:32:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJC2F-0005fu-5n for guix-patches@gnu.org; Fri, 29 Dec 2023 07:32:19 -0500 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1rJC2C-0007u3-CO for guix-patches@gnu.org; Fri, 29 Dec 2023 07:32:18 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-03 (Coremail) with SMTP id rQCowACn2cBDvI5lkAO4AQ--.2773S2; Fri, 29 Dec 2023 20:32:05 +0800 (CST) From: Zheng Junjie Date: Fri, 29 Dec 2023 20:31:41 +0800 Message-ID: <8e34a85422d535bf3acb4dfac643ed559661ddd4.1703853088.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: rQCowACn2cBDvI5lkAO4AQ--.2773S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Cr 1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 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 ;;; Copyright © 2020 Niklas Eklund ;;; Copyright © 2020 Robert Smith -;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021,2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 qblade ;;; Copyright © 2021 lasnesne @@ -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.")