diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2023-12-16 23:14:56 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2023-12-16 23:14:56 -0500 |
| commit | 17c3a3bfff150a42c904233fa39818d73c9f68f3 (patch) | |
| tree | a7614b7cd9a7106ea59f5ac1caad0c2c496b3a45 /gnu/packages/zig.scm | |
| parent | f5493629e2650c0d30caf0f01f76b2383f78b9de (diff) | |
| parent | fe86819d8bde674766659c22b215d3a689a8026e (diff) | |
Merge branch 'master' into mesa-updates
Change-Id: I0c6e2410c51335c68634738be030e374f5b492e9
Diffstat (limited to 'gnu/packages/zig.scm')
| -rw-r--r-- | gnu/packages/zig.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index 08ee650d8b..c9c3ddca62 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -129,7 +129,8 @@ toolchain. Among other features it provides ;; https://github.com/ziglang/zig/issues/6485 (supported-systems %64bit-supported-systems) ;; Stage3 can take a lot of time and isn't verbose. - (properties `((max-silent-time . 9600))) + (properties `((max-silent-time . 9600) + ,@(clang-properties "13"))) (license license:expat))) (define-public zig-0.10 @@ -146,7 +147,8 @@ toolchain. Among other features it provides (file-name (git-file-name name version)) (sha256 (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")) - (patches (search-patches "zig-do-not-link-against-librt.patch")))) + (patches (search-patches "zig-do-not-link-against-librt.patch" + "zig-use-baseline-cpu-by-default.patch")))) (arguments (substitute-keyword-arguments (package-arguments zig-0.9) ((#:configure-flags flags ''()) @@ -191,6 +193,8 @@ toolchain. Among other features it provides (replace "lld" lld-15))) (native-inputs (modify-inputs (package-native-inputs zig-0.9) - (replace "llvm" llvm-15))))) + (replace "llvm" llvm-15))) + (properties `((max-silent-time . 9600) + ,@(clang-properties "15"))))) (define-public zig zig-0.10) |