diff --git a/mk-solc-pkgs.nix b/mk-solc-pkgs.nix
index d33f31d..b3cb6fd 100644
--- a/mk-solc-pkgs.nix
+++ b/mk-solc-pkgs.nix
@@ -1,18 +1,24 @@
 {
   lib,
-  callPackage,
+  stdenv,
+  autoPatchelfHook,
+  fetchurl,
   solc-macos-amd64-list,
   ...
 }:
 
-lib.foldr (
-  binary: all_binaries:
+builtins.foldl' (
+  all_binaries: binary:
   let
     pname = "solc_" + (builtins.replaceStrings [ "." ] [ "_" ] binary.version);
-    maybeSolc = callPackage (import ./mk-solc-static-pkg.nix) {
+    maybeSolc = (import ./mk-solc-static-pkg.nix) {
+      inherit lib;
+      inherit stdenv;
+      inherit autoPatchelfHook;
+      inherit fetchurl;
+      inherit solc-macos-amd64-list;
       solc_ver = binary.version;
       solc_sha256 = binary.sha256;
-      inherit solc-macos-amd64-list;
     };
   in
   if maybeSolc != null then all_binaries // { "${pname}" = maybeSolc; } else all_binaries
diff --git a/test/flake.lock b/test/flake.lock
index fc629f4..ced9308 100644
--- a/test/flake.lock
+++ b/test/flake.lock
@@ -60,12 +60,12 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-c/DSSO9o9SrJ7Pesi8Dbi9TaHMVc2hJHOfAKlvG9ZVs=",
-        "path": "/nix/store/iirld09ix32g485mnrljk5qrw726fmjc-source",
+        "narHash": "sha256-qNfdux8E1J2eTUNuOdO6ThsTTIiFAcJNE91AZDPEgwA=",
+        "path": "/nix/store/hh079iq4l3gpnx16hvbw90jfk9a7qfax-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/iirld09ix32g485mnrljk5qrw726fmjc-source",
+        "path": "/nix/store/hh079iq4l3gpnx16hvbw90jfk9a7qfax-source",
         "type": "path"
       }
     },