Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Use only oxalica/rust-overlay toolchain and not nixpkgs #710

Merged
lx merged 3 commits from oxalica-toolchain-only into main 2024-02-08 22:29:26 +00:00
Conversation 0 Commits 3 Files changed 2 +1 -11
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9e0b1dcf1c - Show all commits

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: