From 03ef0aae0a16f989228dc36ee3d4e25b511be87b Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 23 Jan 2021 19:57:41 -0500 Subject: [PATCH] spdlog: propagate fmt fmt is needed by the CMake config script. --- pkgs/development/libraries/spdlog/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index ac74b74ccf1..7b6c98bebe8 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -14,7 +14,8 @@ let }; nativeBuildInputs = [ cmake ]; - buildInputs = [ fmt ]; + # spdlog <1.3 uses a bundled version of fmt + propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt; cmakeFlags = [ "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" @@ -25,7 +26,9 @@ let "-DSPDLOG_FMT_EXTERNAL=ON" ]; - outputs = [ "out" "doc" ]; + outputs = [ "out" "doc" ] + # spdlog <1.4 is header only, no need to split libraries and headers + ++ lib.optional (lib.versionAtLeast version "1.4") "dev"; postInstall = '' mkdir -p $out/share/doc/spdlog