diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
| commit | a7a8f8253db3f32cc15baf527d36ef7171425eba (patch) | |
| tree | 5de25f1c82e7892f6aec7b3e5ddb718ff0c50df2 /pkgs/development/compilers/mrustc/bootstrap.nix | |
| parent | f31242fcfd14e870eb6898fc8849bc4dee883054 (diff) | |
| parent | 391aafc3d6b17ed5517795eb8b9c41ed7c6082e3 (diff) | |
Merge #263535: staging-next 2023-10-26
Diffstat (limited to 'pkgs/development/compilers/mrustc/bootstrap.nix')
| -rw-r--r-- | pkgs/development/compilers/mrustc/bootstrap.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index a8bf26bacdfd9..0996702ec6253 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -2,7 +2,6 @@ , fetchurl , mrustc , mrustc-minicargo -, rust , llvm_12 , llvmPackages_12 , libffi @@ -74,7 +73,7 @@ stdenv.mkDerivation rec { "MRUSTC=${mrustc}/bin/mrustc" #"MINICARGO=${mrustc-minicargo}/bin/minicargo" # FIXME: we need to rebuild minicargo locally so --manifest-overrides is applied "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config" - "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}" + "RUSTC_TARGET=${stdenv.targetPlatform.rust.rustcTarget}" ]; buildPhase = '' @@ -129,7 +128,7 @@ stdenv.mkDerivation rec { cp run_rustc/${outputDir}/prefix/bin/rustc_binary $out/bin/rustc cp -r run_rustc/${outputDir}/prefix/lib/* $out/lib/ - cp $out/lib/rustlib/${rust.toRustTarget stdenv.targetPlatform}/lib/*.so $out/lib/ + cp $out/lib/rustlib/${stdenv.targetPlatform.rust.rustcTarget}/lib/*.so $out/lib/ runHook postInstall ''; @@ -146,4 +145,3 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; } - |