Merge pull request #2 from holochain/add-intel-apple

Add x86_64-apple cross

Author: ThetaSinner

.github/workflows/build.yaml

@@ -49,9 +49,22 @@ jobs:
         with:
           install_url: https://releases.nixos.org/nix/nix-2.20.4/install
 
-      - name: Build for x86_64-apple-darwin
+      - name: Build for aarch64-apple-darwin
         run: nix build .#holochain_aarch64-apple
 
+  build-holochain-legacy-apple:
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install nix
+        uses: cachix/install-nix-action@v26
+        with:
+          install_url: https://releases.nixos.org/nix/nix-2.20.4/install
+
+      - name: Build for x86_64-apple-darwin
+        run: nix build .#holochain_x86_64-apple
+
   build-lair-keystore:
     runs-on: ubuntu-latest
     steps:
@@ -88,9 +101,22 @@ jobs:
         with:
           install_url: https://releases.nixos.org/nix/nix-2.20.4/install
 
-      - name: Build for x86_64-apple-darwin
+      - name: Build for aarch64-apple-darwin
         run: nix build .#lair_keystore_aarch64-apple
 
+  build-lair-keystore-legacy-apple:
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install nix
+        uses: cachix/install-nix-action@v26
+        with:
+          install_url: https://releases.nixos.org/nix/nix-2.20.4/install
+
+      - name: Build for x86_64-apple-darwin
+        run: nix build .#lair_keystore_x86_64-apple
+
   bundle-x86-64-linux:
     runs-on: ubuntu-latest
     steps:

flake.nix

@@ -73,6 +73,12 @@
                 crossSystem = "aarch64-darwin";
                 rustTargetTriple = "aarch64-apple-darwin";
               };
+            } else if localSystem == "x86_64-darwin" then {
+              "${package}_x86_64-apple" = import ./modules/holochain-cross.nix {
+                inherit localSystem inputs crate package;
+                crossSystem = "x86_64-darwin";
+                rustTargetTriple = "x86_64-apple-darwin";
+              };
             } else { });
 
             defineLairKeystorePackages = {}: {
@@ -97,6 +103,13 @@
                 crossSystem = "aarch64-darwin";
                 rustTargetTriple = "aarch64-apple-darwin";
               };
+
+            } else if localSystem == "x86_64-darwin" then {
+              lair_keystore_x86_64-apple = import ./modules/lair-keystore-cross.nix {
+                inherit localSystem inputs;
+                crossSystem = "x86_64-darwin";
+                rustTargetTriple = "x86_64-apple-darwin";
+              };
             } else { });
 
             extractHolochainBin = bin: pkgs.stdenv.mkDerivation {