3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #131857 from fpletz/pkgs/fluent-bit-1.8.2

This commit is contained in:
Franz Pletz 2022-01-25 16:26:32 +01:00 committed by GitHub
commit 665e63e809
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd }: { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fluent-bit"; pname = "fluent-bit";
version = "1.8.9"; version = "1.8.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fluent"; owner = "fluent";
repo = "fluent-bit"; repo = "fluent-bit";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-b+MZuZQB/sl0HcioU1KCxH3TNiXYSPBfC9dBKqCVeXk="; sha256 = "sha256-DULXfkddBdCvTWkuWXjSTEujRZ3mVVzy//qeB3j0Vz8=";
}; };
patches = lib.optionals stdenv.isDarwin [ patches = lib.optionals stdenv.isDarwin [
@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake flex bison ]; nativeBuildInputs = [ cmake flex bison ];
buildInputs = lib.optionals stdenv.isLinux [ systemd ]; buildInputs = [ openssl ]
++ lib.optionals stdenv.isLinux [ systemd ];
cmakeFlags = [ "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" ]; cmakeFlags = [ "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" ];