hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit 71aea11f2f112f9867e857070b1b1ba822087c90
Author: Hilton Chain <[email protected]>
AuthorDate: Tue Nov 12 18:31:19 2024 +0800
gnu: zig-0.10: Adjust package style.
* gnu/packages/zig.scm (zig-0.10)[arguments]: Strip #:tests?.
<#:phases>: Remove leading "/" for search-input-file.
Change-Id: Iec886bac601487d69070f404fde3d83686b8addb
---
gnu/packages/zig.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index 7f753b1e2b..8b37a19514 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -177,13 +177,13 @@ toolchain. Among other features it provides
version version
"1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b"))
(arguments
- (substitute-keyword-arguments (package-arguments zig-0.9)
+ (substitute-keyword-arguments
+ (strip-keyword-arguments '(#:tests?) (package-arguments zig-0.9))
((#:configure-flags flags ''())
#~(cons* "-DZIG_TARGET_MCPU=baseline"
"-DZIG_SHARED_LLVM=ON"
(string-append "-DZIG_LIB_DIR=" #$output "/lib/zig")
#$flags))
- ((#:tests? _ #t) #t)
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
#$@(if (target-riscv64?)
@@ -199,7 +199,7 @@ toolchain. Among other features it provides
;; Zig uses information about /usr/bin/env to determine the
;; version of glibc and other data.
(substitute* "lib/std/zig/system/NativeTargetInfo.zig"
- (("/usr/bin/env") (search-input-file inputs "/bin/env")))))
+ (("/usr/bin/env") (search-input-file inputs "bin/env")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
