From patchwork Wed Sep 6 09:46:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 53588 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 3425B27BBE2; Wed, 6 Sep 2023 10:48:32 +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 autolearn=ham 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 A862527BBEA for ; Wed, 6 Sep 2023 10:48:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdp8l-0005rI-GK; Wed, 06 Sep 2023 05:48:03 -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 1qdp8j-0005qt-K2 for guix-patches@gnu.org; Wed, 06 Sep 2023 05:48:01 -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 1qdp8j-000450-B8 for guix-patches@gnu.org; Wed, 06 Sep 2023 05:48:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdp8k-0001SZ-4q for guix-patches@gnu.org; Wed, 06 Sep 2023 05:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65777] [PATCH 1/2] gnu: npiet: fix cross-compile. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 09:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65777 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65777@debbugs.gnu.org Received: via spool by 65777-submit@debbugs.gnu.org id=B65777.16939936495408 (code B ref 65777); Wed, 06 Sep 2023 09:48:02 +0000 Received: (at 65777) by debbugs.gnu.org; 6 Sep 2023 09:47:29 +0000 Received: from localhost ([127.0.0.1]:32980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdp8C-0001P5-IA for submit@debbugs.gnu.org; Wed, 06 Sep 2023 05:47:28 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:55830 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdp89-0001Of-HC for 65777@debbugs.gnu.org; Wed, 06 Sep 2023 05:47:27 -0400 Received: from localhost.localdomain (unknown [111.0.51.83]) by APP-05 (Coremail) with SMTP id zQCowAAHD2OhSvhkC3QMCw--.1340S2; Wed, 06 Sep 2023 17:47:13 +0800 (CST) From: Zheng Junjie Date: Wed, 6 Sep 2023 17:46:48 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAAHD2OhSvhkC3QMCw--.1340S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYf7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj 6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F 4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAa Y2xG8wASzI0E04IjxsIE14AKx2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI 8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwAC jcxG0xvY0x0EwIxGrwAKzVC20s0267AEwI8IwI0ExsIj0wCF04k20xvY0x0EwIxGrwCFx2 IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v2 6r1j6r18MI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67 AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IY s7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr 0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8olk3UUUUU== X-Originating-IP: [111.0.51.83] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/piet.scm (npiet): fix cross-compile. [arguments]<#:phases>: Use SEARCH-INPUT-FILE replace WHICH. --- gnu/packages/piet.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/piet.scm b/gnu/packages/piet.scm index 824efe59de..8e5a313e82 100644 --- a/gnu/packages/piet.scm +++ b/gnu/packages/piet.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Jesse Gibbons ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,10 +47,12 @@ (define-public npiet `(#:phases (modify-phases %standard-phases (add-after 'install 'wrap-binaries - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/npietedit") - `("PATH" ":" prefix (,(dirname (which "wish"))))) + `("PATH" ":" prefix + (,(dirname + (search-input-file inputs "bin/wish"))))) #t)))))) (inputs (list gd giflib libpng tk)) From patchwork Wed Sep 6 09:46:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 53587 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 0B58B27BBEC; Wed, 6 Sep 2023 10:48:31 +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 autolearn=ham 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 70B2F27BBE2 for ; Wed, 6 Sep 2023 10:48:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdp8l-0005rG-75; Wed, 06 Sep 2023 05:48:03 -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 1qdp8j-0005qi-1l for guix-patches@gnu.org; Wed, 06 Sep 2023 05:48:01 -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 1qdp8i-00044u-Pl for guix-patches@gnu.org; Wed, 06 Sep 2023 05:48:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdp8j-0001SQ-OT for guix-patches@gnu.org; Wed, 06 Sep 2023 05:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65777] [PATCH 2/2] gnu: npiet: Use Gexp. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 09:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65777 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65777@debbugs.gnu.org Received: via spool by 65777-submit@debbugs.gnu.org id=B65777.16939936485402 (code B ref 65777); Wed, 06 Sep 2023 09:48:01 +0000 Received: (at 65777) by debbugs.gnu.org; 6 Sep 2023 09:47:28 +0000 Received: from localhost ([127.0.0.1]:32978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdp8C-0001P3-7p for submit@debbugs.gnu.org; Wed, 06 Sep 2023 05:47:28 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:55828 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdp89-0001Og-HF for 65777@debbugs.gnu.org; Wed, 06 Sep 2023 05:47:27 -0400 Received: from localhost.localdomain (unknown [111.0.51.83]) by APP-05 (Coremail) with SMTP id zQCowAAHD2OhSvhkC3QMCw--.1340S3; Wed, 06 Sep 2023 17:47:13 +0800 (CST) From: Zheng Junjie Date: Wed, 6 Sep 2023 17:46:49 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAAHD2OhSvhkC3QMCw--.1340S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Aw45XF1ruw13Ar45WrW7Jwb_yoW8Xw4kpF ySya4F9r45JF95Xw4kWF4UWr1agrykGFWYk397uw4fKw4YyFy0yr47tayruF17u3W7Aw4x GFWkXr43Zr93Xr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU90b7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF 7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F4 0Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC 6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x 0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2 zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF 4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWU CwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIda VFxhVjvjDU0xZFpf9x07jn8n5UUUUU= X-Originating-IP: [111.0.51.83] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/piet.scm (npiet): Use Gexp. [arguments]: Use Gexp and remove tail #t. --- gnu/packages/piet.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/piet.scm b/gnu/packages/piet.scm index 8e5a313e82..0b16299482 100644 --- a/gnu/packages/piet.scm +++ b/gnu/packages/piet.scm @@ -21,6 +21,7 @@ (define-module (gnu packages piet) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) @@ -44,16 +45,17 @@ (define-public npiet "0nl59fhdqqr7nslxdirdn8nvlq5wws67c7jyx2ckbmxbc9h8bv9d")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-binaries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/npietedit") - `("PATH" ":" prefix - (,(dirname - (search-input-file inputs "bin/wish"))))) - #t)))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out + "/bin/npietedit") + `("PATH" ":" prefix + (,(dirname + (search-input-file + inputs "bin/wish"))))))))))) (inputs (list gd giflib libpng tk)) (native-inputs (list groff))