* [bug#67624] [PATCH] gnu: ncdu: Use zig-build-system.
@ 2023-12-04 15:48 Ekaitz Zarraga
2023-12-10 4:08 ` bug#67624: " Hilton Chain via Guix-patches via
0 siblings, 1 reply; 2+ messages in thread
From: Ekaitz Zarraga @ 2023-12-04 15:48 UTC (permalink / raw)
To: 67624; +Cc: Ekaitz Zarraga
* gnu/packages/ncdu.scm(ncdu): Move to zig-build-system.
[build-system]: Use zig-build-system.
[phases]: Delegate phase manipulation to the build-system. Remove
'validate-runpath as it fails (we should remove it in the build-system
directly).
[make-flags]: Remove them.
[native-inputs]: Remove zig-0.10.
Change-Id: I9027a1cbd925cfb0c135740e81a33b62cb9d91ca
---
gnu/packages/ncdu.scm | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm
index 30460b404d..1e7598a7fd 100644
--- a/gnu/packages/ncdu.scm
+++ b/gnu/packages/ncdu.scm
@@ -27,8 +27,8 @@ (define-module (gnu packages ncdu)
#:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (guix build-system gnu)
- #:use-module (gnu packages perl)
- #:use-module (gnu packages zig))
+ #:use-module (guix build-system zig)
+ #:use-module (gnu packages perl))
(define-public ncdu-1
;; This old version is ‘LTS’. Version 2 works fine and has more features,
@@ -73,28 +73,16 @@ (define-public ncdu
#~(begin
;; Delete a pregenerated man page. We'll build it ourselves.
(delete-file "ncdu.1")))))
+ (build-system zig-build-system)
(arguments
(list
- #:make-flags
- #~(list (string-append "PREFIX=" #$output)
- (string-append "CC=" #$(cc-for-target))
- (string-append "ZIG_FLAGS=-Drelease-fast"))
#:phases
#~(modify-phases %standard-phases
- (delete 'configure) ; No configure script.
- (add-before 'build 'pre-build
- (lambda _
- (setenv "ZIG_GLOBAL_CACHE_DIR"
- (mkdtemp "/tmp/zig-cache-XXXXXX"))))
+ (delete 'validate-runpath)
(add-after 'build 'build-manpage
(lambda _
- (invoke "make" "doc")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "zig" "test" "build.zig")))))))
- (native-inputs
- (list perl zig-0.10))
+ (invoke "make" "doc"))))))
+ (native-inputs (list perl))
(properties `((tunable? . #t)))))
(define-public ncdu-2
base-commit: 61cc93e49cdc35d3cc1b7f6018a2645628c5e892
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#67624: [PATCH] gnu: ncdu: Use zig-build-system.
2023-12-04 15:48 [bug#67624] [PATCH] gnu: ncdu: Use zig-build-system Ekaitz Zarraga
@ 2023-12-10 4:08 ` Hilton Chain via Guix-patches via
0 siblings, 0 replies; 2+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-12-10 4:08 UTC (permalink / raw)
To: Ekaitz Zarraga; +Cc: 67624-done
Hi Ekaitz,
On Mon, 04 Dec 2023 23:48:39 +0800,
Ekaitz Zarraga wrote:
>
> * gnu/packages/ncdu.scm(ncdu): Move to zig-build-system.
> [build-system]: Use zig-build-system.
> [phases]: Delegate phase manipulation to the build-system. Remove
> 'validate-runpath as it fails (we should remove it in the build-system
> directly).
> [make-flags]: Remove them.
> [native-inputs]: Remove zig-0.10.
>
> Change-Id: I9027a1cbd925cfb0c135740e81a33b62cb9d91ca
> ---
> gnu/packages/ncdu.scm | 24 ++++++------------------
> 1 file changed, 6 insertions(+), 18 deletions(-)
I have adjusted commit message and applied the patch as
20223da2f21cb1a0879aaed4b915305d1f197522, thank you!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-10 4:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-04 15:48 [bug#67624] [PATCH] gnu: ncdu: Use zig-build-system Ekaitz Zarraga
2023-12-10 4:08 ` bug#67624: " Hilton Chain via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).