diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-10-13 14:35:39 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-10-14 14:30:48 +0200 |
| commit | 8d04ae7014991319e97d4280f0e9d7a70c89f10b (patch) | |
| tree | caef421dd2ac7d047045d04f5cb4893138759adf /nix/toolchain.nix | |
| parent | a096ced35562bd0a8877a1ee2f755be1edafe343 (diff) | |
| download | garage-8d04ae7014991319e97d4280f0e9d7a70c89f10b.tar.gz garage-8d04ae7014991319e97d4280f0e9d7a70c89f10b.zip | |
cargo2nix unstable (patched), rust 1.63.0, nixpkgs 22.05 (32-bit builds are broken)
Diffstat (limited to 'nix/toolchain.nix')
| -rw-r--r-- | nix/toolchain.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nix/toolchain.nix b/nix/toolchain.nix index 7f5d89d3..d6fe295a 100644 --- a/nix/toolchain.nix +++ b/nix/toolchain.nix @@ -14,18 +14,22 @@ let pkgsList = builtins.map (target: import pkgsSrc { inherit system; crossSystem = { config = target; }; + 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.clippy pkgs.buildPackages.stdenv.cc ]) pkgsList) ++ [ kaniko winscp + manifestTool ] |