diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/rust/1_45.nix')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/1_45.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/compilers/rust/1_45.nix b/nixpkgs/pkgs/development/compilers/rust/1_45.nix index 05db4520f652..b4d887f2e964 100644 --- a/nixpkgs/pkgs/development/compilers/rust/1_45.nix +++ b/nixpkgs/pkgs/development/compilers/rust/1_45.nix @@ -11,15 +11,24 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security -, llvmPackages_5 -, pkgsBuildTarget, pkgsBuildBuild +, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform +, llvmPackages_5, llvm_10 } @ args: import ./default.nix { rustcVersion = "1.45.2"; rustcSha256 = "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp"; + llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; }; + + llvmBootstrapForDarwin = llvmPackages_5; + + # For use at runtime + llvmShared = llvm_10.override { enableSharedLibraries = true; }; + # Note: the version MUST be one version prior to the version we're # building bootstrapVersion = "1.44.1"; @@ -32,6 +41,7 @@ import ./default.nix { armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54"; aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49"; x86_64-apple-darwin = "a5464e7bcbce9647607904a4afa8362382f1fc55d39e7bbaf4483ac00eb5d56a"; + powerpc64le-unknown-linux-gnu = "22deeca259459db31065af7c862fcab7fbfb623200520c65002ed2ba93d87ad2"; }; selectRustPackage = pkgs: pkgs.rust_1_45; @@ -40,4 +50,4 @@ import ./default.nix { ]; } -(builtins.removeAttrs args [ "fetchpatch" ]) +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_10" ]) |