force "solc-static-linux" for now

hellwolf · May 25, 2024 · 43697cd · 43697cd
1 parent 5296c62
commit 43697cd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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