rustPlatform: fix darwin build failure #101136
Merged
Conversation
This file contains 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
ofborg
bot
added
6.topic: darwin
|
I think we could apply it conditionally on diff --git i/pkgs/top-level/all-packages.nix w/pkgs/top-level/all-packages.nix
index c74f2249fc8..c5bfc9416f8 100644
--- i/pkgs/top-level/all-packages.nix
+++ w/pkgs/top-level/all-packages.nix
@@ -9661,11 +9661,11 @@ in
# So this commit doesn't remove the 1.45.2 release.
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
- llvmPackages = llvmPackages_10;
+ llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10;
};
rust_1_46 = callPackage ../development/compilers/rust/1_46.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
- llvmPackages = llvmPackages_10;
+ llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10;
};
rust = rust_1_46; |
marsam
approved these changes
Oct 20, 2020
|
Merging as it's blocking |
bobrik
added a commit
to bobrik/nixpkgs
that referenced
this pull request
Mar 18, 2021
We downgraded when LLVM 10 wasn't working well on Darwin: NixOS#101136. Now that we're using LLVM 11, the issue is no longer present.
10 tasks
thefloweringash
pushed a commit
to thefloweringash/nixpkgs
that referenced
this pull request
Mar 18, 2021
We downgraded when LLVM 10 wasn't working well on Darwin: NixOS#101136. Now that we're using LLVM 11, the issue is no longer present. (cherry picked from commit df2cdfa)
zowoq
pushed a commit
that referenced
this pull request
Mar 19, 2021
We downgraded when LLVM 10 wasn't working well on Darwin: #101136. Now that we're using LLVM 11, the issue is no longer present.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
Fix https://hydra.nixos.org/build/128509615/nixlog/2
Kind of reverts the clang changes in b837bd4.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)