diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-11-27 01:01:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-27 01:01:00 -0500 |
| commit | 821f42f182893e662f4e6d4cda606b09806cbeea (patch) | |
| tree | 601e5251832bd47d58d3522c0cc13f1e872d173b /pkgs/tools/misc | |
| parent | 8c00e6fdfab22a5ee8a7b3ca310da4c92e1121ef (diff) | |
| parent | e40ebf0bf7e7314649928f219ae78e2a5585b656 (diff) | |
Merge pull request #147064 from smancill/fluent-bit-upstream-patch
fluent-bit: use upstream patches
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/fluent-bit/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/tools/misc/fluent-bit/fix-cmetrics-darwin.patch | 23 |
2 files changed, 16 insertions, 25 deletions
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 713b1df0c4e9..f6dd32396d84 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, flex, bison, systemd }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd }: stdenv.mkDerivation rec { pname = "fluent-bit"; @@ -12,7 +12,21 @@ stdenv.mkDerivation rec { }; patches = lib.optionals stdenv.isDarwin [ - ./fix-cmetrics-darwin.patch + # 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 ]; diff --git a/pkgs/tools/misc/fluent-bit/fix-cmetrics-darwin.patch b/pkgs/tools/misc/fluent-bit/fix-cmetrics-darwin.patch deleted file mode 100644 index 8bd77605cbc0..000000000000 --- a/pkgs/tools/misc/fluent-bit/fix-cmetrics-darwin.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git i/lib/cmetrics/src/cmt_time.c w/lib/cmetrics/src/cmt_time.c ---- i/lib/cmetrics/src/cmt_time.c -+++ w/lib/cmetrics/src/cmt_time.c -@@ -20,7 +20,7 @@ - #include <cmetrics/cmt_info.h> - - /* MacOS */ --#ifdef FLB_HAVE_CLOCK_GET_TIME -+#ifdef CMT_HAVE_CLOCK_GET_TIME - #include <mach/clock.h> - #include <mach/mach.h> - #endif -@@ -41,8 +41,8 @@ - mach_timespec_t mts; - host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); - clock_get_time(cclock, &mts); -- tm->tv_sec = mts.tv_sec; -- tm->tv_nsec = mts.tv_nsec; -+ tm.tv_sec = mts.tv_sec; -+ tm.tv_nsec = mts.tv_nsec; - mach_port_deallocate(mach_task_self(), cclock); - #else /* __STDC_VERSION__ */ - clock_gettime(CLOCK_REALTIME, &tm); |