Armael/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Activity

[oxalica-toolchain-only] remove use of nixos rust toolchain

Browse source
This commit is contained in:
Alex 2024-02-08 19:10:26 +01:00
parent 304a89c57b
commit 9e0b1dcf1c
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nix/compile.nix
View file

@ -30,19 +30,9 @@ let
In practise, rustOverlay ships rustc+cargo in a single derivation while In practise, rustOverlay ships rustc+cargo in a single derivation while
NixOS ships them in separate ones. We reunite them with symlinkJoin. NixOS ships them in separate ones. We reunite them with symlinkJoin.
*/ */
toolchainOptions = if target == null || target == "x86_64-unknown-linux-musl" toolchainOptions = {
|| target == "aarch64-unknown-linux-musl" then {
rustVersion = "1.73.0"; rustVersion = "1.73.0";
extraRustComponents = [ "clippy" ]; extraRustComponents = [ "clippy" ];
} else {
rustToolchain = pkgs.symlinkJoin {
name = "rust-static-toolchain-${target}";
paths = [
pkgs.rustPlatform.rust.cargo
pkgs.rustPlatform.rust.rustc
# clippy not needed, it only runs on amd64
];
};
}; };
buildEnv = (drv: buildEnv = (drv: