tremor-rs: fix build on x86_64-darwin

This commit is contained in:
Weijia Wang 2023-07-04 10:58:27 +03:00 committed by Yt
parent 4b99db5862
commit ee6562d051
2 changed files with 9 additions and 3 deletions

View file

@ -63,6 +63,13 @@ rustPlatform.buildRustPackage rec {
PROTOC = "${protobuf}/bin/protoc"; PROTOC = "${protobuf}/bin/protoc";
PROTOC_INCLUDE = "${protobuf}/include"; PROTOC_INCLUDE = "${protobuf}/include";
env = lib.optionalAttrs (stdenv.system == "x86_64-darwin") {
RUSTFLAGS = "-C target-feature=+avx,+avx2,+sse4.2";
};
# tests failed on x86_64-darwin with SIGILL: illegal instruction
doCheck = !(stdenv.system == "x86_64-darwin");
checkFlags = [ checkFlags = [
# all try to make a network access # all try to make a network access
"--skip=connectors::tests::http::server::https_server_test" "--skip=connectors::tests::http::server::https_server_test"
@ -77,7 +84,6 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p tremor-cli" ]; cargoBuildFlags = [ "-p tremor-cli" ];
meta = with lib; { meta = with lib; {
broken = stdenv.isDarwin && stdenv.isx86_64;
description = '' description = ''
Early stage event processing system for unstructured data with rich Early stage event processing system for unstructured data with rich
support for structural pattern matching, filtering and transformation support for structural pattern matching, filtering and transformation

View file

@ -14090,8 +14090,8 @@ with pkgs;
tre = callPackage ../development/libraries/tre { }; tre = callPackage ../development/libraries/tre { };
tremor-rs = callPackage ../tools/misc/tremor-rs { tremor-rs = darwin.apple_sdk_11_0.callPackage ../tools/misc/tremor-rs {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk_11_0.frameworks) Security;
}; };
tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { }; tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { };