public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc: 1_52, use correct llvm version

This commit is contained in:
Luka Blaskovic 2021-05-15 07:58:22 +00:00 committed by Jonathan Ringer
parent 0ef2fe6f77
commit 76e136bb5e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/rust/1_52.nix
View File

@ -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"])

2
pkgs/top-level/all-packages.nix
View File

@ -11597,7 +11597,7 @@ in
};
rust_1_52 = callPackage ../development/compilers/rust/1_52.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
llvm_11 = llvmPackages_11.libllvm;
llvm_12 = llvmPackages_12.libllvm;
};
rust = rust_1_52;