diff options
| author | Ivan Babrou <github@ivan.computer> | 2021-03-17 21:01:44 -0700 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-03-20 06:12:48 +1000 |
| commit | 2cf3641a5c5739155d2cd90c07e2894766c3c7ff (patch) | |
| tree | c326544ea3520c2f7c0570316a86060e74926cfe /pkgs/development/compilers/rust | |
| parent | 7598a80b52009ec2a6b388dfded00671b5cfbab7 (diff) | |
| download | nixpkgs-2cf3641a5c5739155d2cd90c07e2894766c3c7ff.tar nixpkgs-2cf3641a5c5739155d2cd90c07e2894766c3c7ff.tar.gz nixpkgs-2cf3641a5c5739155d2cd90c07e2894766c3c7ff.tar.bz2 nixpkgs-2cf3641a5c5739155d2cd90c07e2894766c3c7ff.tar.lz nixpkgs-2cf3641a5c5739155d2cd90c07e2894766c3c7ff.tar.xz nixpkgs-2cf3641a5c5739155d2cd90c07e2894766c3c7ff.tar.zst nixpkgs-2cf3641a5c5739155d2cd90c07e2894766c3c7ff.zip | |
rustc: update llvm on darwin to current
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.
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/1_50.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rust/1_50.nix b/pkgs/development/compilers/rust/1_50.nix index 06449d59dad..4e393a588fb 100644 --- a/pkgs/development/compilers/rust/1_50.nix +++ b/pkgs/development/compilers/rust/1_50.nix @@ -15,7 +15,7 @@ , CoreFoundation, Security , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform -, llvmPackages_5, llvm_11 +, llvmPackages_11, llvm_11 } @ args: import ./default.nix { @@ -26,7 +26,7 @@ import ./default.nix { llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; }; llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; }; - llvmBootstrapForDarwin = llvmPackages_5; + llvmBootstrapForDarwin = llvmPackages_11; # For use at runtime llvmShared = llvm_11.override { enableSharedLibraries = true; }; @@ -54,4 +54,4 @@ import ./default.nix { ]; } -(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_11"]) +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"]) |