hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit da0d2bd69e0e00744091f9bf7009c311e3480e8d
Author: Hilton Chain <[email protected]>
AuthorDate: Tue Dec 31 08:52:53 2024 +0800
squash! build-system: zig: Support Zig package manager.
Change-Id: Id1fded11e9817f6581b3c9d058ca292da8abe785
---
gnu/packages/zig.scm | 14 +++++++-------
guix/build/zig-build-system.scm | 1 -
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index cefd73699d..f095b5a44b 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -65,19 +65,19 @@
(use-modules (ice-9 match)
(guix build utils))
(for-each
- (match-lambda
- ((old-name . new-name)
- (for-each
- (lambda (directory)
+ (lambda (directory)
+ (for-each
+ (match-lambda
+ ((old-name . new-name)
(with-directory-excursion directory
(substitute* "build.zig"
(((string-append "([Dd]ependency.\")" old-name) _ prefix)
(string-append prefix new-name)))
(substitute* "build.zig.zon"
(((format #f "\\.(@\")?~a\"?" old-name))
- (format #f ".@\"~a\"" new-name)))))
- (quote ,directories))))
- (quote ,mapping))))
+ (format #f ".@\"~a\"" new-name))))))
+ (quote ,mapping)))
+ (quote ,directories))))
(define (zig-source version commit hash)
(origin
diff --git a/guix/build/zig-build-system.scm b/guix/build/zig-build-system.scm
index 60e0935282..85d54c0aa5 100644
--- a/guix/build/zig-build-system.scm
+++ b/guix/build/zig-build-system.scm
@@ -100,7 +100,6 @@
(or (and=> (getenv "GUIX_ZIG_PACKAGE_PATH")
(cut string-split <> #\:))
'())))
- ;; Asserting "out" output, as in `install'.
;; zig-aaa-0.1.2-3.456789a -> zig-aaa
;; zig-bbb-2.3.3 -> zig-bbb
(define (strip-version input)
