Merge pull request #114060 from marsam/update-fluent-bit
fluent-bit: 1.6.8 -> 1.7.1
This commit is contained in:
commit
34ebb29633
|
@ -2,18 +2,21 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fluent-bit";
|
pname = "fluent-bit";
|
||||||
version = "1.6.8";
|
version = "1.7.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fluent";
|
owner = "fluent";
|
||||||
repo = "fluent-bit";
|
repo = "fluent-bit";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1k8ghz8xwy7v4y4r4xc690ig7qmn0mkvynplwn66j44fgdpg0v1s";
|
sha256 = "1xzbsnij0xsgd5j11frkf35w8rkr55hq2yl7myaxrgzh686a8law";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake flex bison ];
|
nativeBuildInputs = [ cmake flex bison ];
|
||||||
|
|
||||||
patches = [ ./fix-luajit-darwin.patch ];
|
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";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/CMakeLists.txt \
|
substituteInPlace src/CMakeLists.txt \
|
||||||
|
|
Loading…
Reference in New Issue