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 ''