From 8d04ae7014991319e97d4280f0e9d7a70c89f10b Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 13 Oct 2022 14:35:39 +0200
Subject: cargo2nix unstable (patched), rust 1.63.0, nixpkgs 22.05 (32-bit
 builds are broken)

---
 nix/toolchain.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nix/toolchain.nix')

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
   ]
 
-- 
cgit v1.2.3


From e89e047c5af33ac47dabbcfdc12305d544a13ade Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 14 Oct 2022 15:45:37 +0200
Subject: Fix i386 build with custom toolchain (armv6 unknown state)

---
 nix/toolchain.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'nix/toolchain.nix')

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
-- 
cgit v1.2.3