Unverified Commit 29ac6225 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234425 from wegank/tremor-rs-aarch64 

tremor-*: build on more platforms
parents cfbb8e82 e1884a16

pkgs/tools/misc/tremor-rs/default.nix

+2 −6
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, rustPlatform

, pkg-config

, cmake

, llvmPackages

, openssl

, fetchFromGitHub

, installShellFiles
@@ -33,7 +32,7 @@ rustPlatform.buildRustPackage rec { 
    };

  };



  nativeBuildInputs = [ cmake pkg-config installShellFiles ];

  nativeBuildInputs = [ cmake pkg-config installShellFiles rustPlatform.bindgenHook ];



  buildInputs = [ openssl ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ];
@@ -57,8 +56,6 @@ rustPlatform.buildRustPackage rec { 
      --zsh <($out/bin/tremor completions zsh)

  '';



  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";



  # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled.

  OPENSSL_NO_VENDOR = 1;
@@ -80,14 +77,13 @@ rustPlatform.buildRustPackage rec { 
  cargoBuildFlags = [ "-p tremor-cli" ];



  meta = with lib; {

    broken = stdenv.isDarwin;

    broken = stdenv.isDarwin && stdenv.isx86_64;

    description = ''

      Early stage event processing system for unstructured data with rich

      support for structural pattern matching, filtering and transformation

    '';

    homepage = "https://www.tremor.rs/";

    license = licenses.asl20;

    platforms = platforms.x86_64;

    maintainers = with maintainers; [ humancalico happysalada ];

  };

}

pkgs/tools/misc/tremor-rs/ls.nix

+1 −3
Original line number Diff line number Diff line 
{ lib

, rustPlatform

, fetchFromGitHub

, llvmPackages

}:



rustPlatform.buildRustPackage rec {
@@ -15,7 +14,7 @@ rustPlatform.buildRustPackage rec { 
    sha256 = "sha256-odYhpb3FkbIF1dc2DSpz3Lg+r39lhDKml9KGmbqJAtA=";

  };



  LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

  nativeBuildInputs = [ rustPlatform.bindgenHook ];



  cargoSha256 = "sha256-/RKwmslhMm30QxviVV7HthDHSmTmaGZn1hdt6bNF3d4=";
@@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { 
    description = "Tremor Language Server (Trill)";

    homepage = "https://www.tremor.rs/docs/next/getting-started/tooling";

    license = licenses.asl20;

    platforms = platforms.x86_64;

    maintainers = with maintainers; [ happysalada ];

  };

}