From a2d74e8cf8700472a74b22025685e1e549ba69c0 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Wed, 24 Jul 2024 21:21:32 +0200 Subject: Add zig 0.13.0 and remove master --- zig.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zig.scm b/zig.scm index 5e977aa..c956bcf 100644 --- a/zig.scm +++ b/zig.scm @@ -101,10 +101,10 @@ toolchain. Among other features it provides (license license:expat))) -(define-public zig-master +(define-public zig (package - (name "zig-master") - (version "master") + (name "zig") + (version "0.13.0") (source (origin (method git-fetch) @@ -113,7 +113,7 @@ toolchain. Among other features it provides (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15pi43l1fla89n5kdink05a6a0cxqbf51nl0j2mvgxvcry12ql31")) + (base32 "0ly8042lbsa8019g0d1jg4l06rxpq2530n9mijq66n4lmx7a5976")) (patches (search-patches "zig-do-not-link-against-librt.patch")))) (build-system cmake-build-system) (arguments @@ -145,7 +145,7 @@ toolchain. Among other features it provides (lambda* (#:key inputs #:allow-other-keys) ;; Zig uses information about /usr/bin/env to determine the ;; version of glibc and other data. - (substitute* "lib/std/zig/system/NativeTargetInfo.zig" + (substitute* "lib/std/zig/system.zig" (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) (delete 'check) (add-after 'install 'check @@ -158,13 +158,13 @@ toolchain. Among other features it provides ;; binaries. "-Dskip-non-native"))))))) (inputs - (list clang-17 ; Clang propagates llvm. - lld-17 + (list clang-18 ; Clang propagates llvm. + lld-18 zlib (list zstd "lib"))) ;; Zig compiles fine with GCC, but also needs native LLVM libraries. (native-inputs - (list llvm-17)) + (list llvm-18)) (native-search-paths (list (search-path-specification -- cgit v1.2.3