From f3d632c7017fcba71e2f0a2bd14aa189ab9c104a Mon Sep 17 00:00:00 2001
From: Ning Shang <syncom.dev@gmail.com>
Date: Tue, 30 Apr 2024 15:33:04 -0700
Subject: [PATCH] rust-overlay: add i686-linux target (#32)

For 32-bit x86 binary on Linux.
---
 nix-rust-overlay/Dockerfile     |  8 +++++++-
 nix-rust-overlay/shell-i686.nix | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 nix-rust-overlay/shell-i686.nix

diff --git a/nix-rust-overlay/Dockerfile b/nix-rust-overlay/Dockerfile
index e22fbca..1bb167b 100644
--- a/nix-rust-overlay/Dockerfile
+++ b/nix-rust-overlay/Dockerfile
@@ -38,6 +38,7 @@ ENV NIX_PATH=nixpkgs=/build/nixpkgs:rust-overlay=/build/rust-overlay
 #########################################################
 COPY nix-rust-overlay/shell-x86_64-win.nix /build/${RUST_PROJECT_NAME}/shell-x86_64-win.nix
 COPY nix-rust-overlay/shell-x86_64.nix /build/${RUST_PROJECT_NAME}/shell-x86_64.nix
+COPY nix-rust-overlay/shell-i686.nix /build/${RUST_PROJECT_NAME}/shell-i686.nix
 COPY nix-rust-overlay/shell-aarch64.nix /build/${RUST_PROJECT_NAME}/shell-aarch64.nix
 COPY nix-rust-overlay/shell-armv7.nix /build/${RUST_PROJECT_NAME}/shell-armv7.nix
 COPY nix-rust-overlay/shell-armv6.nix /build/${RUST_PROJECT_NAME}/shell-armv6.nix
@@ -59,6 +60,8 @@ RUN cd /build/${RUST_PROJECT_NAME} && \
       nix-shell shell-armv6.nix
 RUN cd /build/${RUST_PROJECT_NAME} && \
       nix-shell shell-armv7.nix
+RUN cd /build/${RUST_PROJECT_NAME} && \
+      nix-shell shell-i686.nix
 
 #########################################################
 # Step 3: Cross builds for various targets
@@ -89,4 +92,7 @@ RUN cd /build/${RUST_PROJECT_NAME} && \
              echo TARGET=arm-unknown-linux-musleabihf make run" && \
     nix-shell shell-armv7.nix \
       --run "TARGET=armv7-unknown-linux-musleabihf make && \
-             echo TARGET=armv7-unknown-linux-musleabihf make run"
+             echo TARGET=armv7-unknown-linux-musleabihf make run" && \
+    nix-shell shell-i686.nix \
+      --run "TARGET=i686-unknown-linux-musl make && \
+             echo TARGET=i686-unknown-linux-musl make run"
diff --git a/nix-rust-overlay/shell-i686.nix b/nix-rust-overlay/shell-i686.nix
new file mode 100644
index 0000000..f912c29
--- /dev/null
+++ b/nix-rust-overlay/shell-i686.nix
@@ -0,0 +1,21 @@
+# h/t https://github.com/oxalica/rust-overlay/tree/master/examples/cross-aarch64
+# When invoking with `nix-shell`, add "rust-overlay=/path/to/rust-overlay/dir"
+# to $NIX_PATH
+(import <nixpkgs> {
+  crossSystem = "i686-linux";
+  overlays = [ (import <rust-overlay>) ];
+}).pkgsMusl.pkgsStatic.callPackage (
+{ mkShell, stdenv, rust-bin, pkg-config, openssl, qemu }:
+mkShell {
+  nativeBuildInputs = [
+    rust-bin.stable."1.76.0".minimal
+    pkg-config
+  ];
+
+  depsBuildBuild = [ qemu ];
+
+  buildInputs = [ openssl ];
+
+  CARGO_TARGET_I686_UNKNOWN_LINUX_MUSL_LINKER = "${stdenv.cc.targetPrefix}cc";
+  CARGO_TARGET_I686_UNKNOWN_LINUX_MUSL_RUNNER = "qemu-i386";
+}) {}