From patchwork Tue Oct 17 14:43:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 54936 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 E8D3C27BBE9; Tue, 17 Oct 2023 15:46:11 +0100 (BST) 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,URIBL_BLOCKED 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 9469527BBE2 for ; Tue, 17 Oct 2023 15:46:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qslKa-00049G-7g; Tue, 17 Oct 2023 10:46:01 -0400 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 1qslKD-0003yz-F7 for guix-patches@gnu.org; Tue, 17 Oct 2023 10:45:40 -0400 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 1qslKD-0006Dt-7O for guix-patches@gnu.org; Tue, 17 Oct 2023 10:45:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qslKc-00037z-KK for guix-patches@gnu.org; Tue, 17 Oct 2023 10:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66593] [PATCH] gnu: cups: Fix cross-compiling. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Oct 2023 14:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66593 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66593@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169755395612004 (code B ref -1); Tue, 17 Oct 2023 14:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Oct 2023 14:45:56 +0000 Received: from localhost ([127.0.0.1]:60807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qslKW-00037Y-96 for submit@debbugs.gnu.org; Tue, 17 Oct 2023 10:45:56 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qslKT-00037H-Jb for submit@debbugs.gnu.org; Tue, 17 Oct 2023 10:45:55 -0400 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 1qslJx-0003qi-QT for guix-patches@gnu.org; Tue, 17 Oct 2023 10:45:21 -0400 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 1qslJs-0005ri-HO for guix-patches@gnu.org; Tue, 17 Oct 2023 10:45:21 -0400 Received: from localhost.localdomain (unknown [183.247.5.151]) by APP-03 (Coremail) with SMTP id rQCowABnb6PsnS5lBBJPEg--.15772S2; Tue, 17 Oct 2023 22:45:01 +0800 (CST) From: Zheng Junjie Date: Tue, 17 Oct 2023 22:43:56 +0800 Message-ID: <01589deed1d8ce00f26af78aca76fce3cb8a7317.1697553836.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: rQCowABnb6PsnS5lBBJPEg--.15772S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_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.151] 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 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/cups.scm (cups-filters)[native-inputs]: When cross-compiling add cups-minimal. (cups-minimal)[native-inputs]: When cross-compiling add this-package. --- gnu/packages/cups.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) base-commit: e80022ff3adde3184bed6758f604e3aa12942865 diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 647b89dc03..fc26fd70ca 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021, 2023 Maxim Cournoyer +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -204,8 +205,11 @@ (define-public cups-filters (find-files (string-append #$output "/lib/cups/filter")))))))) (native-inputs - (list `(,glib "bin") ; for gdbus-codegen - pkg-config)) + (append (if (%current-target-system) + (list cups-minimal) + '()) + (list `(,glib "bin") ; for gdbus-codegen + pkg-config))) (inputs (list avahi fontconfig @@ -315,7 +319,10 @@ (define-public cups-minimal ;; to a missing font. Substitute the last observed count. (("(\\$count != )33" _ prefix) (string-append prefix "39")))))))) - (native-inputs (list config pkg-config)) + (native-inputs (cons* config pkg-config + (if (%current-target-system) + (list this-package) + '()))) (inputs (list zlib gnutls)) (home-page "https://openprinting.github.io/cups") (synopsis "The Common Unix Printing System")