diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix | 6 | ||||
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index 174c0f42684f..ec1a0072a559 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.6.0"; + version = "1.6.7"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1m8ly2h52mw67kqc7qqpf7sxxnyk4fnw2qavjpj6zgw3i6dhj0p1"; + sha256 = "1rybz69yhjm1g8m6wmn6v143a65y69w2fvs62yr8n1r92cadzbia"; }; nativeBuildInputs = [ cmake flex bison ]; + patches = [ ./fix-luajit-darwin.patch ]; + postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace /lib/systemd $out/lib/systemd diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch new file mode 100644 index 000000000000..21d9c21f5b9b --- /dev/null +++ b/infra/libkookie/nixpkgs/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 |