Merged
Conversation
33694ed to
9b9d509
Compare
Member
|
@ofborg build zig_0_10 |
wegank
approved these changes
Mar 14, 2023
Member
|
@ofborg build ncdu |
Contributor
|
Can make 0.10 the default on darwin as well. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0d1e76e1c3..62a5de4e4df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24198,8 +24198,7 @@ with pkgs;
zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10.nix {
llvmPackages = llvmPackages_15;
};
- # Zig 0.10.1 is broken on Darwin, so use 0.9.1 on Darwin instead.
- zig = if stdenv.isDarwin then zig_0_9 else zig_0_10;
+ zig = zig_0_10;
zimlib = callPackage ../development/libraries/zimlib { };
|
Relevant upstream issue: ziglang/zig#14559 The patch is a backport of fixes that landed in zig-master and can be removed with zig-0.11 release. Additionally, make sure we link statically against LLVM to avoid unpleasant runtime surprises originating from mixing static and dynamic LLVM libraries. Finally, unbreak Zig 0.10.1 on macOS.
9b9d509 to
18c80c1
Compare
Contributor
Author
Done! |
Member
|
I haven't been able to build Zig on my machine, and I now think it's probably because I have XCode Command Line Tools installed. Since the builds succeed on ofborg, I assume that merging this PR is fine. |
Member
|
@ofborg eval |
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Relevant upstream issue: ziglang/zig#14559
The patch is a backport of fixes that landed in zig-master and can be removed with zig-0.11 release.
Additionally, make sure we link statically against LLVM to avoid unpleasant runtime surprises originating from mixing static and dynamic LLVM libraries.
Finally, unbreak Zig 0.10.1 on macOS.
cc @winterqt
Closes #214545.
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)