hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit 36735c9733184f7896ff0c82e4cc11c9c9c0dd17
Author: Hilton Chain <[email protected]>
AuthorDate: Mon Dec 2 14:51:48 2024 +0800
squash! gnu: Add zig-zls-0.12.
Change-Id: Ib72034df021965e85e3660326f992ade787426d5
---
gnu/packages/zig-xyz.scm | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index e9128a187e..debd26edde 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -294,17 +294,29 @@ Language Server Protocol} for the Zig programming
language.")
(inherit zig-zls-0.10)
(name "zig-zls")
(version "0.12.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/zigtools/zls";)
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1ini1ifa9b0v2ika3sqsiiv2p7v9npfslss45280yxwn2pjqmn7n"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zigtools/zls";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ini1ifa9b0v2ika3sqsiiv2p7v9npfslss45280yxwn2pjqmn7n"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(for-each
+ (lambda (dep)
+ (substitute* "build.zig"
+ (((string-append "(b\\.dependency.\")" (car dep)) _ prefix)
+ (string-append prefix (cdr dep))))
+ (substitute* "build.zig.zon"
+ (((string-append "\\." (car dep)))
+ (format #f ".@\"~a\"" (cdr dep)))))
+ '(("diffz" . "zig-diffz")
+ ("known_folders" . "zig-known-folders"))))))
(build-system zig-build-system)
- (inputs (list zig-0.12))
(arguments
(let ((version-data-path
#~(string-append "-Dversion_data_path="
@@ -316,10 +328,8 @@ Language Server Protocol} for the Zig programming
language.")
#:zig-build-flags
#~(list #$version-data-path)
#:zig-test-flags
- #~(list #$version-data-path)
- #:zig-inputs
- `(("known_folders" ,zig-known-folders)
- ("diffz" ,zig-diffz)))))))
+ #~(list #$version-data-path))))
+ (inputs (list zig-0.12 zig-diffz zig-known-folders))))
(define-public zig-zls-0.13
(package
