From d810d826e578eda655278a644e88d4df58496093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:13:43 +0100 Subject: [PATCH] nix: testing bindgenHook on macos-12 --- .github/workflows/ci.yml | 2 +- pyperscan.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa6314b..6dcd47d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: - os: ubuntu-latest arch: aarch64-linux drv: "vectorscan" - - os: macos-11 + - os: macos-latest arch: x86_64-darwin drv: vectorscan name: Nix - ${{ matrix.arch }}.${{ matrix.drv }} diff --git a/pyperscan.nix b/pyperscan.nix index c2a1f03..909ba30 100644 --- a/pyperscan.nix +++ b/pyperscan.nix @@ -99,10 +99,10 @@ let ++ (optionals (vendorVectorscan) [ "-F vectorscan" ]); nativeBuildInputs = with rustPlatform; [ + bindgenHook cargoSetupHook (maturinBuildHook.override { pkgsHostTarget = { inherit maturin cargo rustc; }; }) ] ++ optional (vendor && stdenv.isLinux) util-linux - ++ optional (!stdenv.isDarwin) bindgenHook # HACK: bindgen segfaults on Darwin with LLVM from nixpkgs ++ optional coverage cargo-llvm-cov; preConfigure = optionalString coverage ''