aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2024-02-08 19:10:26 +0100
committerAlex Auvolat <alex@adnab.me>2024-02-08 19:10:26 +0100
commit9e0b1dcf1c342d4efbf46c17ef179ba884b3aa5e (patch)
treeb8f0a1fb43730a73209cef735a521dc2736b7af4
parent304a89c57b1e951481cd0bf2e56582b41b6d73e4 (diff)
downloadgarage-9e0b1dcf1c342d4efbf46c17ef179ba884b3aa5e.tar.gz
garage-9e0b1dcf1c342d4efbf46c17ef179ba884b3aa5e.zip
[oxalica-toolchain-only] remove use of nixos rust toolchainoxalica-toolchain-only
-rw-r--r--nix/compile.nix12
1 files changed, 1 insertions, 11 deletions
diff --git a/nix/compile.nix b/nix/compile.nix
index c51188fe..f13c4877 100644
--- a/nix/compile.nix
+++ b/nix/compile.nix
@@ -30,19 +30,9 @@ let
In practise, rustOverlay ships rustc+cargo in a single derivation while
NixOS ships them in separate ones. We reunite them with symlinkJoin.
*/
- toolchainOptions = if target == null || target == "x86_64-unknown-linux-musl"
- || target == "aarch64-unknown-linux-musl" then {
+ toolchainOptions = {
rustVersion = "1.73.0";
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: