GNU bug report logs - #65777
[PATCH 0/2] npiet: fix cross-compile.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65777 in the body.
You can then email your comments to 65777 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] npiet: fix cross-compile.
Date: Wed,  6 Sep 2023 17:43:06 +0800

npiet: fix cross-compile.

Zheng Junjie (2):
  gnu: npiet: fix cross-compile.
  gnu: npiet: Use Gexp.

 gnu/packages/piet.scm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)


base-commit: 6113e0529d61df7425f64e30a6bf77f7cfdfe5a5
-- 
2.41.0

Message #8 received at 65777 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 65777 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: npiet: Use Gexp.
Date: Wed,  6 Sep 2023 17:46:49 +0800

* 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))
-- 
2.41.0

Message #11 received at 65777 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 65777 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: npiet: fix cross-compile.
Date: Wed,  6 Sep 2023 17:46:48 +0800

* 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 <jgibbons2357+guix <at> gmail.com>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> 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))
-- 
2.41.0

Message #16 received at 65777-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 65777-done <at> debbugs.gnu.org
Subject: Re: bug#65777: [PATCH 0/2] npiet: fix cross-compile.
Date: Thu, 14 Sep 2023 16:55:40 +0200

Hi,

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> skribis:

>   gnu: npiet: fix cross-compile.
>   gnu: npiet: Use Gexp.

Applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.