diff options
Diffstat (limited to 'pkgs/by-name/fl/fluent-bit/package.nix')
| -rw-r--r-- | pkgs/by-name/fl/fluent-bit/package.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index dbbb41852524..8c6c762e66c3 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,17 +14,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.1.8"; + version = "3.1.10"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-SQltn4tbBGOFxascERG7J29vGz/jdq/4BWMH7P4BP64="; + hash = "sha256-/YKXWYaDqkJ8fWgcYktXWJPcjDJTupgRTSQVp0cWruY="; }; # optional only to avoid linux rebuild - patches = lib.optionals stdenv.isDarwin [ ./macos-11-sdk-compat.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macos-11-sdk-compat.patch ]; nativeBuildInputs = [ cmake @@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { libyaml postgresql ] - ++ lib.optionals stdenv.isLinux [ systemd ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Foundation ]; @@ -49,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: { "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" "-DFLB_OUT_PGSQL=ON" - ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; env.NIX_CFLAGS_COMPILE = toString ( # Used by the embedded luajit, but is not predefined on older mac SDKs. - lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" ] + lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" ] # Assumes GNU version of strerror_r, and the posix version has an # incompatible return type. ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ "-Wno-int-conversion" ] |