public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122371 from stephank/fix-tremor-darwin

Browse Source 
tremor-rs: build on darwin
This commit is contained in:
Sandro 2021-05-11 00:43:46 +02:00 committed by GitHub
commit 711ad46bd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/misc/tremor-rs/default.nix
View File

@ -1,5 +1,5 @@
{ lib, rustPlatform, pkg-config, cmake, llvmPackages, openssl, fetchFromGitHub { lib, rustPlatform, pkg-config, cmake, llvmPackages, openssl, fetchFromGitHub
, installShellFiles }: , installShellFiles, stdenv, Security, libiconv }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tremor"; pname = "tremor";
@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ cmake pkg-config installShellFiles ]; nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs = [ openssl ]; buildInputs = [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ];
# TODO export TREMOR_PATH($out/lib) variable # TODO export TREMOR_PATH($out/lib) variable
postInstall = '' postInstall = ''
@ -40,7 +41,7 @@ rustPlatform.buildRustPackage rec {
description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation";
homepage = "https://www.tremor.rs/"; homepage = "https://www.tremor.rs/";
license = licenses.asl20; license = licenses.asl20;
platforms = [ "x86_64-linux" ]; platforms = platforms.x86_64;
maintainers = with maintainers; [ humancalico ]; maintainers = with maintainers; [ humancalico ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -9465,7 +9465,9 @@ in
tre = callPackage ../development/libraries/tre { }; tre = callPackage ../development/libraries/tre { };
tremor-rs = callPackage ../tools/misc/tremor-rs { }; tremor-rs = callPackage ../tools/misc/tremor-rs {
inherit (darwin.apple_sdk.frameworks) Security;
};
ts = callPackage ../tools/system/ts { }; ts = callPackage ../tools/system/ts { };