diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-10-14 15:45:37 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-10-14 18:10:24 +0200 |
| commit | e89e047c5af33ac47dabbcfdc12305d544a13ade (patch) | |
| tree | 411d204765054f4e57973facf20f4eea6c75d4c5 /nix/toolchain.nix | |
| parent | 8d04ae7014991319e97d4280f0e9d7a70c89f10b (diff) | |
| download | garage-e89e047c5af33ac47dabbcfdc12305d544a13ade.tar.gz garage-e89e047c5af33ac47dabbcfdc12305d544a13ade.zip | |
Fix i386 build with custom toolchain (armv6 unknown state)
Diffstat (limited to 'nix/toolchain.nix')
| -rw-r--r-- | nix/toolchain.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nix/toolchain.nix b/nix/toolchain.nix index d6fe295a..079fcf13 100644 --- a/nix/toolchain.nix +++ b/nix/toolchain.nix @@ -6,14 +6,17 @@ 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 {}; @@ -25,7 +28,6 @@ in lib.flatten (builtins.map (pkgs: [ pkgs.rustPlatform.rust.rustc pkgs.rustPlatform.rust.cargo - pkgs.clippy pkgs.buildPackages.stdenv.cc ]) pkgsList) ++ [ kaniko |