diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-02-23 06:52:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-23 06:52:07 -0500 |
| commit | 34ebb296333e3a9debe91bf2645ef0a43352b2a9 (patch) | |
| tree | 70288ba39524dbea378866972798f36feca73e1e /pkgs | |
| parent | 79e09720733da885f2ead3ac84504a69b03045f9 (diff) | |
| parent | c8ce05d30823f3ff8b9071347f2254b244da5acd (diff) | |
Merge pull request #114060 from marsam/update-fluent-bit
fluent-bit: 1.6.8 -> 1.7.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/fluent-bit/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index aa9f175e90047..a504efbf1eb23 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,18 +2,21 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.6.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1k8ghz8xwy7v4y4r4xc690ig7qmn0mkvynplwn66j44fgdpg0v1s"; + sha256 = "1xzbsnij0xsgd5j11frkf35w8rkr55hq2yl7myaxrgzh686a8law"; }; 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 = '' substituteInPlace src/CMakeLists.txt \ |