Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b2a20c2a5158
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1de45ad619b
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 9, 2020

  1. fluent-bit: fix build on darwin

    @SuperSandro2000 @alyssais
    SuperSandro2000 authored and alyssais committed Nov 9, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    d1de45a View commit details
Showing with 16 additions and 0 deletions.
  1. +2 −0 pkgs/tools/misc/fluent-bit/default.nix
  2. +14 −0 pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch
2 changes: 2 additions & 0 deletions pkgs/tools/misc/fluent-bit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch
View file
Original file line number Diff line number Diff line change
@@ -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