* [bug#65777] [PATCH 0/2] npiet: fix cross-compile.
@ 2023-09-06 9:43 Zheng Junjie
2023-09-06 9:46 ` [bug#65777] [PATCH 1/2] gnu: " Zheng Junjie
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Zheng Junjie @ 2023-09-06 9:43 UTC (permalink / raw)
To: 65777
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#65777] [PATCH 1/2] gnu: npiet: fix cross-compile.
2023-09-06 9:43 [bug#65777] [PATCH 0/2] npiet: fix cross-compile Zheng Junjie
@ 2023-09-06 9:46 ` Zheng Junjie
2023-09-06 9:46 ` [bug#65777] [PATCH 2/2] gnu: npiet: Use Gexp Zheng Junjie
2023-09-14 14:55 ` bug#65777: [PATCH 0/2] npiet: fix cross-compile Ludovic Courtès
2 siblings, 0 replies; 4+ messages in thread
From: Zheng Junjie @ 2023-09-06 9:46 UTC (permalink / raw)
To: 65777
[-- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#65777] [PATCH 2/2] gnu: npiet: Use Gexp.
2023-09-06 9:43 [bug#65777] [PATCH 0/2] npiet: fix cross-compile Zheng Junjie
2023-09-06 9:46 ` [bug#65777] [PATCH 1/2] gnu: " Zheng Junjie
@ 2023-09-06 9:46 ` Zheng Junjie
2023-09-14 14:55 ` bug#65777: [PATCH 0/2] npiet: fix cross-compile Ludovic Courtès
2 siblings, 0 replies; 4+ messages in thread
From: Zheng Junjie @ 2023-09-06 9:46 UTC (permalink / raw)
To: 65777
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#65777: [PATCH 0/2] npiet: fix cross-compile.
2023-09-06 9:43 [bug#65777] [PATCH 0/2] npiet: fix cross-compile Zheng Junjie
2023-09-06 9:46 ` [bug#65777] [PATCH 1/2] gnu: " Zheng Junjie
2023-09-06 9:46 ` [bug#65777] [PATCH 2/2] gnu: npiet: Use Gexp Zheng Junjie
@ 2023-09-14 14:55 ` Ludovic Courtès
2 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2023-09-14 14:55 UTC (permalink / raw)
To: Zheng Junjie; +Cc: 65777-done
Hi,
Zheng Junjie <zhengjunjie@iscas.ac.cn> skribis:
> gnu: npiet: fix cross-compile.
> gnu: npiet: Use Gexp.
Applied, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-14 14:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-06 9:43 [bug#65777] [PATCH 0/2] npiet: fix cross-compile Zheng Junjie
2023-09-06 9:46 ` [bug#65777] [PATCH 1/2] gnu: " Zheng Junjie
2023-09-06 9:46 ` [bug#65777] [PATCH 2/2] gnu: npiet: Use Gexp Zheng Junjie
2023-09-14 14:55 ` bug#65777: [PATCH 0/2] npiet: fix cross-compile Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.