diff options
Diffstat (limited to 'pkgs/tools/misc/fluent-bit')
| -rw-r--r-- | pkgs/tools/misc/fluent-bit/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch | 14 |
2 files changed, 30 insertions, 7 deletions
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 28c005b7abb..fe7599ac815 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -1,29 +1,38 @@ -{ stdenv, fetchFromGitHub, cmake, flex, bison }: +{ lib, stdenv, fetchFromGitHub, cmake, flex, bison, systemd }: stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.5.3"; + version = "1.7.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "153c7hafmzwxa24h923irfhzaqqd8wbr2aaab6l3hjhgx5q8s5bf"; + sha256 = "sha256-rL2IJYTMs0Yzo/oqrcI56krmVnxxxRWCebSjjbjiP/k="; }; nativeBuildInputs = [ cmake flex bison ]; + buildInputs = lib.optionals stdenv.isLinux [ systemd ]; + + cmakeFlags = [ "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" ]; + + patches = lib.optionals stdenv.isDarwin [ ./fix-luajit-darwin.patch ]; + + # _FORTIFY_SOURCE requires compiling with optimization (-O) + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O"; + + outputs = [ "out" "dev" ]; + postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace /lib/systemd $out/lib/systemd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Log forwarder and processor, part of Fluentd ecosystem"; homepage = "https://fluentbit.io"; - maintainers = with maintainers; [ - samrose - ]; + maintainers = with maintainers; [ samrose fpletz ]; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch b/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch new file mode 100644 index 00000000000..21d9c21f5b9 --- /dev/null +++ b/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch @@ -0,0 +1,14 @@ +diff -Naur fluent-bit.old/cmake/luajit.cmake fluent-bit.new/cmake/luajit.cmake +--- fluent-bit.old/cmake/luajit.cmake ++++ fluent-bit.new/cmake/luajit.cmake +@@ -11,10 +11,6 @@ + set(LUAJIT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${FLB_PATH_LIB_LUAJIT}) + set(LUAJIT_DEST ${CMAKE_CURRENT_BINARY_DIR}) + +-if (CMAKE_SYSTEM_NAME MATCHES "Darwin") +- set(CFLAGS "${CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT}") +-endif() +- + # luajit (UNIX) + # ============= + ExternalProject_Add(luajit |