diff options
| author | Alex <alex@adnab.me> | 2024-02-08 22:29:25 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-02-08 22:29:25 +0000 |
| commit | 8061bf5e1c250ff9234894f7a63910fedef1357b (patch) | |
| tree | 46c462fa8de931ff296596921bdd4bcb9715ed19 /nix/toolchain.nix | |
| parent | 304a89c57b1e951481cd0bf2e56582b41b6d73e4 (diff) | |
| parent | 8724aabdf5463c3baedff5bfbfa9e0f71510ef96 (diff) | |
| download | garage-8061bf5e1c250ff9234894f7a63910fedef1357b.tar.gz garage-8061bf5e1c250ff9234894f7a63910fedef1357b.zip | |
Merge pull request 'Use only oxalica/rust-overlay toolchain and not nixpkgs' (#710) from oxalica-toolchain-only into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/710
Diffstat (limited to 'nix/toolchain.nix')
| -rw-r--r-- | nix/toolchain.nix | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/nix/toolchain.nix b/nix/toolchain.nix index 532db74e..c4fef9ab 100644 --- a/nix/toolchain.nix +++ b/nix/toolchain.nix @@ -3,29 +3,9 @@ with import ./common.nix; let - platforms = [ - #"x86_64-unknown-linux-musl" - "i686-unknown-linux-musl" - #"aarch64-unknown-linux-musl" - "armv6l-unknown-linux-musleabihf" - ]; - pkgsList = builtins.map (target: - import pkgsSrc { - inherit system; - 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 - pkgs.rustPlatform.rust.cargo - pkgs.buildPackages.stdenv.cc -]) pkgsList) ++ [ kaniko winscp manifestTool ] +in [ kaniko winscp manifestTool ] |