diff options
| author | Luka Blaskovic <lblasc@tvbeat.com> | 2021-05-15 07:58:22 +0000 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-17 08:40:12 -0700 |
| commit | ded99630e9d8275bc6f0759730294f71216d8a52 (patch) | |
| tree | e482f83b5f40a8a2557362d48567547ade2a65f5 /pkgs/development/compilers/rust | |
| parent | d916642bc55ffe5915537a0792e3cc07dba63eee (diff) | |
| download | nixpkgs-ded99630e9d8275bc6f0759730294f71216d8a52.tar nixpkgs-ded99630e9d8275bc6f0759730294f71216d8a52.tar.gz nixpkgs-ded99630e9d8275bc6f0759730294f71216d8a52.tar.bz2 nixpkgs-ded99630e9d8275bc6f0759730294f71216d8a52.tar.lz nixpkgs-ded99630e9d8275bc6f0759730294f71216d8a52.tar.xz nixpkgs-ded99630e9d8275bc6f0759730294f71216d8a52.tar.zst nixpkgs-ded99630e9d8275bc6f0759730294f71216d8a52.zip | |
rustc: 1_52, use correct llvm version
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/1_52.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/compilers/rust/1_52.nix b/pkgs/development/compilers/rust/1_52.nix index 775792d06f6..822708741bd 100644 --- a/pkgs/development/compilers/rust/1_52.nix +++ b/pkgs/development/compilers/rust/1_52.nix @@ -15,21 +15,22 @@ , CoreFoundation, Security , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform -, llvmPackages_11, llvm_11 +, llvmPackages_11 +, llvmPackages_12, llvm_12 } @ args: import ./default.nix { rustcVersion = "1.52.1"; rustcSha256 = "sha256-Om8jom0Oj4erv78yxc19qgwLcdCYar78Vrml+/vQv5g="; - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; llvmBootstrapForDarwin = llvmPackages_11; # For use at runtime - llvmShared = llvm_11.override { enableSharedLibraries = true; }; + llvmShared = llvm_12.override { enableSharedLibraries = true; }; # Note: the version MUST be one version prior to the version we're # building @@ -55,4 +56,4 @@ import ./default.nix { ]; } -(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"]) +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_12" "llvm_12"]) |