diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2020-11-03 00:52:05 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-09 12:16:19 +0000 |
| commit | d1de45ad619be065294fdd9692a268ea1863b083 (patch) | |
| tree | 5ece4c2dbc1667eb65475dbe2eb07768adcfa52b /pkgs/tools/misc/fluent-bit | |
| parent | b2a20c2a5158db6840f6efb944999b92337e040c (diff) | |
fluent-bit: fix build on darwin
Diffstat (limited to 'pkgs/tools/misc/fluent-bit')
| -rw-r--r-- | pkgs/tools/misc/fluent-bit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 51b58a8102de6..0f67ab84d443b 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison ]; + patches = [ ./fix-luajit-darwin.patch ]; + postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace /lib/systemd $out/lib/systemd diff --git a/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch b/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch new file mode 100644 index 0000000000000..21d9c21f5b9b3 --- /dev/null +++ b/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 |