From 4ed47982cf10f2d7209be9361fdeeaa6007f51e6 Mon Sep 17 00:00:00 2001 From: ada Date: Thu, 17 Sep 2026 17:07:01 -0500 Subject: [PATCH] Minimize packaged Rust toolchain --- flake.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 5a2fdcf6..ba3865f9 100644 --- a/flake.nix +++ b/flake.nix @@ -26,16 +26,24 @@ buildInputs = with pkgs; [ openssl ]; - toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; + toolchainConfig = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml)).toolchain; + packageToolchain = pkgs.rust-bin.fromRustupToolchain ( + toolchainConfig + // { + profile = "minimal"; + components = [ "rustc-dev" ]; + } + ); rustPlatform = pkgs.makeRustPlatform { - cargo = toolchain; - rustc = toolchain; + cargo = packageToolchain; + rustc = packageToolchain; }; in { packages = { default = self.outputs.packages.${system}.bevy; + rustToolchain = packageToolchain; bevy = rustPlatform.buildRustPackage { pname = "bevy"; version = "0.1.0-dev"; @@ -47,11 +55,15 @@ nativeBuildInputs = nativeBuildInputs ++ (with pkgs; [ makeBinaryWrapper ]); postInstall = '' for bin in $out/bin/bevy{,_lint}; do - wrapProgram $bin --set BEVY_LINT_SYSROOT ${toolchain} + wrapProgram $bin --set BEVY_LINT_SYSROOT ${packageToolchain} done ''; inherit buildInputs; + passthru = { + inherit packageToolchain; + rustToolchainChannel = toolchainConfig.channel; + }; }; };