github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

build(nix): install musl targets in dev-shell (#6493)

Browse Source 
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.
This commit is contained in:
Thomas Eizinger
2024-08-30 00:43:43 +01:00
committed by GitHub
parent 2a808292d0
commit 3974bb6614
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/nix/flake.nix
View File

@@ -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;
}
);
}