Try to fix Cairo Nix build

informalsystems · Sep 6, 2024 · f3949bb · f3949bb
1 parent 5217af9
commit f3949bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
@@ -11,7 +11,7 @@ on:
 jobs:
   test-contracts:
     name: Build MacOS Nix dependencies
-    runs-on: macos-latest
+    runs-on: macos-14
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
@@ -27,4 +27,5 @@ jobs:
 
       - name: Run Nix build
         run: |
+          nix build -L .#cairo
           nix develop -c true
diff --git a/flake.lock b/flake.lock
diff --git a/nix/cairo.nix b/nix/cairo.nix
@@ -11,13 +11,18 @@ let
     cargoHash = "sha256-piabK7UNyt2hWoqR5IDnCZoo8+VvSthSao3sQXKjE0o=";
 
     OPENSSL_NO_VENDOR = 1;
+    AARCH64_APPLE_DARWIN_OPENSSL_NO_VENDOR = 1;
     PKG_CONFIG_PATH = "${nixpkgs.openssl.dev}/lib/pkgconfig";
 
     nativeBuildInputs = [
+      nixpkgs.libiconv
       nixpkgs.pkg-config
     ];
 
     buildInputs = nixpkgs.lib.optionals nixpkgs.stdenv.isDarwin [
+      nixpkgs.libiconv
+      nixpkgs.pkg-config
+      nixpkgs.darwin.apple_sdk.frameworks.Security
       nixpkgs.darwin.apple_sdk.frameworks.SystemConfiguration
     ];
   };