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

fluent-bit: 1.8.11 -> 1.9.3

Browse Source 
https://fluentbit.io/announcements/v1.9.3/
This commit is contained in:
Mario Rodas 2022-06-04 04:20:00 +00:00
parent 4a9708930d
commit fdd55bbd0f
2 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/tools/misc/fluent-bit/default.nix
View File

@ -1,35 +1,16 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd, openssl }:
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison, systemd, openssl }:
stdenv.mkDerivation rec {
pname = "fluent-bit";
version = "1.8.11";
version = "1.9.3";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
sha256 = "sha256-DULXfkddBdCvTWkuWXjSTEujRZ3mVVzy//qeB3j0Vz8=";
sha256 = "sha256-CMkVIWaD4Zt6SJ/4PLGrFDhirqeLbXcVa+96wsAYN/k=";
};
patches = lib.optionals stdenv.isDarwin [
# Fix compilations errors on darwin
(fetchpatch {
url = "https://github.com/calyptia/cmetrics/commit/4f0f7ae2eeec148a69156f9fcc05d64bf249d11e.patch";
sha256 = "sha256-M1+28mHxpMvcFkOoKxkMMo1VCQsG33ncFZkFalOq2FQ=";
stripLen = 1;
extraPrefix = "lib/cmetrics/";
})
(fetchpatch {
url = "https://github.com/calyptia/cmetrics/commit/a97999cb6d7299ef230d216b7a1c584b43c64de9.patch";
sha256 = "sha256-RuyPEeILc86n/klPIb334XpX0F71nskQ8s/ya0rE2zI=";
stripLen = 1;
extraPrefix = "lib/cmetrics/";
})
# Fix bundled luajit compilation args
./fix-luajit-darwin.patch
];
nativeBuildInputs = [ cmake flex bison ];
buildInputs = [ openssl ]

29
pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch
View File

@ -1,29 +0,0 @@
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
@@ -12,15 +12,7 @@
set(LUAJIT_DEST ${CMAKE_CURRENT_BINARY_DIR})
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
- set(CFLAGS "${CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT} -fno-stack-check")
- if (CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20
- AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 21)
- set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=11.0")
- else()
- set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=10.15")
- endif()
-else()
- set(DEPLOYMENT_TARGET "")
+ set(CFLAGS "${CFLAGS} -fno-stack-check")
endif()
# luajit (UNIX)
@@ -30,7 +22,7 @@
EXCLUDE_FROM_ALL TRUE
SOURCE_DIR ${LUAJIT_SRC}
CONFIGURE_COMMAND ./configure
- BUILD_COMMAND $(MAKE) CROSS=${CROSS_PREFIX} CFLAGS=${CFLAGS} BUILD_MODE=static "XCFLAGS=-fPIC" ${DEPLOYMENT_TARGET}
+ BUILD_COMMAND $(MAKE) DEFAULT_CC=cc CROSS=${CROSS_PREFIX} CFLAGS=${CFLAGS} BUILD_MODE=static "XCFLAGS=-fPIC"
INSTALL_COMMAND cp src/libluajit.a "${LUAJIT_DEST}/lib/libluajit.a")
# luajit (Windows)