From 43697cdccc645075b1e19e1ba0a0c9a6dd051a8f Mon Sep 17 00:00:00 2001
From: "Miao, ZhiCheng" <zhicheng.miao@gmail.com>
Date: Sat, 25 May 2024 19:59:37 +0300
Subject: [PATCH] force "solc-static-linux" for now

---
 flake.nix              | 2 +-
 mk-solc-pkgs.nix       | 4 ++--
 mk-solc-static-pkg.nix | 1 +
 test/flake.lock        | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 33c8fa5..4829b69 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
     let
       solc-macos-amd64-list = builtins.fromJSON (builtins.readFile solc-macos-amd64-list-json);
       solc-pkgs-overlay =
-        final: prev: import ./mk-solc-pkgs.nix (prev // { inherit solc-macos-amd64-list; });
+        final: prev: import ./mk-solc-pkgs.nix prev { inherit solc-macos-amd64-list; };
     in
     flake-utils.lib.eachSystem
       [
diff --git a/mk-solc-pkgs.nix b/mk-solc-pkgs.nix
index 1f96181..b887011 100644
--- a/mk-solc-pkgs.nix
+++ b/mk-solc-pkgs.nix
@@ -1,10 +1,10 @@
-{ solc-macos-amd64-list, ... }@pkgs:
+pkgs : { solc-macos-amd64-list }:
 
 builtins.foldl' (
   all_binaries: binary:
   let
     pname = "solc_" + (builtins.replaceStrings [ "." ] [ "_" ] binary.version);
-    maybeSolc = (import ./mk-solc-static-pkg.nix) (pkgs // {
+    maybeSolc = import ./mk-solc-static-pkg.nix (pkgs // {
       solc_ver = binary.version;
       solc_sha256 = binary.sha256;
       inherit solc-macos-amd64-list;
diff --git a/mk-solc-static-pkg.nix b/mk-solc-static-pkg.nix
index ff8ffe7..807d3be 100644
--- a/mk-solc-static-pkg.nix
+++ b/mk-solc-static-pkg.nix
@@ -23,6 +23,7 @@ let
   inherit (stdenv.hostPlatform) system;
   solc-flavor =
     {
+      i686-linux = "solc-static-linux"; # this is weird
       x86_64-linux = "solc-static-linux";
       x86_64-darwin = "solc-macos-amd64";
       aarch64-darwin = "solc-macos-aarch64";
diff --git a/test/flake.lock b/test/flake.lock
index 6f87d8e..e933315 100644
--- a/test/flake.lock
+++ b/test/flake.lock
@@ -60,12 +60,12 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-R+n3/2Sc/AtKZBmU6Sq+o/yeqlWSxK8pAyWuqb/rdbc=",
-        "path": "/nix/store/0vd7l2k975zck8971mhf94hy4g3pjf39-source",
+        "narHash": "sha256-vUG5JZmu8fN5yT9300Z1Ao7TZmcHNzk1liBxgbb9Bj0=",
+        "path": "/nix/store/mid47zhb8qj4p7s77l0dzjkqsdqmsqm1-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/0vd7l2k975zck8971mhf94hy4g3pjf39-source",
+        "path": "/nix/store/mid47zhb8qj4p7s77l0dzjkqsdqmsqm1-source",
         "type": "path"
       }
     },