build(nix): update dependencies

Signed-off-by: Roman Volosatovs <[email protected]>
wasmCloud · Dec 6, 2024 · a6538fe · a6538fe
1 parent 40cd6f2
commit a6538fe
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 85 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -85,6 +85,7 @@
         targets.s390x-unknown-linux-gnu = false;
         targets.wasm32-unknown-unknown = false;
         targets.wasm32-wasip1 = false;
+        targets.wasm32-wasip2 = false;
 
         clippy.deny = ["warnings"];
         clippy.workspace = true;
@@ -97,51 +98,26 @@
           pkgsCross ? pkgs,
           ...
         }: {
-          buildInputs ? [],
-          depsBuildBuild ? [],
-          nativeBuildInputs ? [],
           nativeCheckInputs ? [],
           preCheck ? "",
           ...
         } @ args:
-          with pkgs.lib; let
-            darwin2darwin = pkgs.stdenv.hostPlatform.isDarwin && pkgsCross.stdenv.hostPlatform.isDarwin;
-
-            depsBuildBuild' =
-              depsBuildBuild
-              ++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
-              ++ optional darwin2darwin pkgs.xcbuild.xcrun;
-          in
-            {
-              buildInputs =
-                buildInputs
-                ++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.libiconv;
-
-              depsBuildBuild = depsBuildBuild';
-            }
-            // optionalAttrs (args ? cargoArtifacts) {
-              preCheck =
-                ''
-                  export GOCACHE=$TMPDIR/gocache
-                  export GOMODCACHE=$TMPDIR/gomod
-                  export GOPATH=$TMPDIR/go
-                  export HOME=$TMPDIR/home
-                ''
-                + preCheck;
-
-              depsBuildBuild =
-                depsBuildBuild'
-                ++ optionals darwin2darwin [
-                  pkgs.darwin.apple_sdk.frameworks.CoreFoundation
-                  pkgs.darwin.apple_sdk.frameworks.CoreServices
-                ];
-
-              nativeCheckInputs =
-                nativeCheckInputs
-                ++ [
-                  pkgs.pkgsUnstable.go
-                ];
-            };
+          optionalAttrs (args ? cargoArtifacts) {
+            preCheck =
+              ''
+                export GOCACHE=$TMPDIR/gocache
+                export GOMODCACHE=$TMPDIR/gomod
+                export GOPATH=$TMPDIR/go
+                export HOME=$TMPDIR/home
+              ''
+              + preCheck;
+
+            nativeCheckInputs =
+              nativeCheckInputs
+              ++ [
+                pkgs.pkgsUnstable.go
+              ];
+          };
 
         withPackages = {
           hostRustToolchain,