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

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

[Zheng Junjie]

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

[bug#65777] [PATCH 1/2] gnu: npiet: fix cross-compile.

[Zheng Junjie]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1323 bytes --]

* 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@gmail.com>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; 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))
-- 
2.41.0

[bug#65777] [PATCH 2/2] gnu: npiet: Use Gexp.

[Zheng Junjie]

* 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

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

[Ludovic Courtès]

Hi,

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

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

Applied, thanks!

Ludo’.