Merge branch 'main' into next

holochain-open-dev · Sep 27, 2024 · 13312b9 · 13312b9
2 parents c2c6ad9 + af1cb7d
commit 13312b9
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 39 deletions.
diff --git a/flake.nix b/flake.nix
@@ -69,15 +69,18 @@
 
             pkgs.darwin.apple_sdk.frameworks.AppKit
             pkgs.darwin.apple_sdk.frameworks.WebKit
-            (pkgs.darwin.apple_sdk_11_0.stdenv.mkDerivation {
-              name = "go";
-              nativeBuildInputs = with pkgs; [ makeBinaryWrapper go ];
-              dontBuild = true;
-              dontUnpack = true;
-              installPhase = ''
-                makeWrapper ${pkgs.go}/bin/go $out/bin/go
-              '';
-            })
+            (if pkgs.system == "x86_64-darwin" then
+              (pkgs.darwin.apple_sdk_11_0.stdenv.mkDerivation {
+                name = "go";
+                nativeBuildInputs = with pkgs; [ makeBinaryWrapper go ];
+                dontBuild = true;
+                dontUnpack = true;
+                installPhase = ''
+                  makeWrapper ${pkgs.go}/bin/go $out/bin/go
+                '';
+              })
+            else
+              pkgs.go)
           ]);
         builders = {
           rustZome = { crateCargoToml, workspacePath, cargoArtifacts ? null

diff --git a/nix/fixtures/module-repo/Cargo.lock b/nix/fixtures/module-repo/Cargo.lock
diff --git a/nix/reference-happ/Cargo.lock b/nix/reference-happ/Cargo.lock