diff options
| author | Alex <alex@adnab.me> | 2022-10-18 14:16:52 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2022-10-18 14:16:52 +0000 |
| commit | 7bc9fd34b250384d1b80ed28dc6c9e6abcda69ae (patch) | |
| tree | 2aa704a85ec0fe7ef8e28daaa1c71fd449be1453 /nix/toolchain.nix | |
| parent | 4582a8f34aba85ff7b0a56935f27cc166819dec1 (diff) | |
| parent | a54a63c491556b746dab02a0766034af70c61457 (diff) | |
| download | garage-7bc9fd34b250384d1b80ed28dc6c9e6abcda69ae.tar.gz garage-7bc9fd34b250384d1b80ed28dc6c9e6abcda69ae.zip | |
Merge pull request 'upgrade Nix toolchain' (#400) from upgrade-toolchain into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/400
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 ] |