diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-11-07 12:20:59 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-11-07 12:20:59 +0100 |
| commit | 28d7a49f6365fadaffaa903cc10434c1ed28d564 (patch) | |
| tree | 8da5b3213b7ff199af80e64af29a7a1395b9d02d /nix/toolchain.nix | |
| parent | 3039bb5d431532f0ec907eab5e00f94acc4a3472 (diff) | |
| parent | 66f2daa0259538c64508b37cec89d76a74a71a02 (diff) | |
| download | garage-28d7a49f6365fadaffaa903cc10434c1ed28d564.tar.gz garage-28d7a49f6365fadaffaa903cc10434c1ed28d564.zip | |
Merge branch 'main' into optimal-layout
Diffstat (limited to 'nix/toolchain.nix')
| -rw-r--r-- | nix/toolchain.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nix/toolchain.nix b/nix/toolchain.nix index 7f5d89d3..079fcf13 100644 --- a/nix/toolchain.nix +++ b/nix/toolchain.nix @@ -6,19 +6,24 @@ with import ./common.nix; let platforms = [ - "x86_64-unknown-linux-musl" + #"x86_64-unknown-linux-musl" "i686-unknown-linux-musl" - "aarch64-unknown-linux-musl" + #"aarch64-unknown-linux-musl" "armv6l-unknown-linux-musleabihf" ]; pkgsList = builtins.map (target: import pkgsSrc { inherit system; - crossSystem = { config = target; }; + crossSystem = { + config = target; + isStatic = true; + }; + overlays = [ cargo2nixOverlay ]; }) platforms; pkgsHost = import pkgsSrc {}; lib = pkgsHost.lib; kaniko = (import ./kaniko.nix) pkgsHost; winscp = (import ./winscp.nix) pkgsHost; + manifestTool = (import ./manifest-tool.nix) pkgsHost; in lib.flatten (builtins.map (pkgs: [ pkgs.rustPlatform.rust.rustc @@ -27,5 +32,6 @@ in ]) pkgsList) ++ [ kaniko winscp + manifestTool ] |