From 3974bb66142b7876a8338971354ff977a3c5ef1c Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Fri, 30 Aug 2024 00:43:43 +0100 Subject: [PATCH] build(nix): install musl targets in dev-shell (#6493) To build for musl, the target needs to be installed. Within the Nix dev-shell, we don't manage versions / components via rustup, thus they need to be added manually. --- scripts/nix/flake.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/nix/flake.nix b/scripts/nix/flake.nix index 2a98aa7d7..eaaacee7d 100644 --- a/scripts/nix/flake.nix +++ b/scripts/nix/flake.nix @@ -55,7 +55,11 @@ mkShellWithRustVersion = rustVersion: pkgs.mkShell { packages = [ pkgs.cargo-tauri pkgs.iptables pkgs.nodePackages.pnpm cargo-udeps pkgs.cargo-sort ]; - buildInputs = rustVersion ++ packages; + buildInputs = packages ++ [ + (rustVersion.override { + targets = [ "x86_64-unknown-linux-musl" ]; + }) + ]; name = "rust-env"; src = ../../rust; @@ -64,13 +68,8 @@ }; in { - devShells.default = mkShellWithRustVersion [ - (pkgs.rust-bin.fromRustupToolchainFile ../../rust/rust-toolchain.toml) - ]; - - devShells.nightly = mkShellWithRustVersion [ - (pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default)) - ]; + devShells.default = mkShellWithRustVersion (pkgs.rust-bin.fromRustupToolchainFile ../../rust/rust-toolchain.toml); + devShells.nightly = mkShellWithRustVersion rust-nightly; } ); }