GNU bug report logs - #67624
[PATCH] gnu: ncdu: Use zig-build-system.

Previous Next

Full log

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

From: Ekaitz Zarraga <ekaitz <at> elenq.tech>
To: guix-patches <at> gnu.org
Cc: Ekaitz Zarraga <ekaitz <at> elenq.tech>
Subject: [PATCH] gnu: ncdu: Use zig-build-system.
Date: Mon,  4 Dec 2023 16:48:39 +0100

* 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

Previous Next

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