git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #110730 from lopsided98/spdlog-fmt-propagate

spdlog: propagate fmt

commit3285bc82191552562d9d2d03d0a8a8a29a5ff478 authorJörg Thalheim <Mic92@users.noreply.github.com> dateWed 27 Jan 2021, 14:08 (6 years ago) parent8ac455d03ef0aa
1 file changed+5−2
pkgs/development/libraries/spdlog/default.nix+5−2
pkgs/development/libraries/spdlog/default.nix+5−2
@@ -14,7 +14,8 @@ let
1414 };
1515
1616 nativeBuildInputs = [ cmake ];
17− buildInputs = [ fmt ];
17+ # spdlog <1.3 uses a bundled version of fmt
18+ propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt;
1819
1920 cmakeFlags = [
2021 "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
@@ -25,7 +26,9 @@ let
2526 "-DSPDLOG_FMT_EXTERNAL=ON"
2627 ];
2728
28− outputs = [ "out" "doc" ];
29+ outputs = [ "out" "doc" ]
30+ # spdlog <1.4 is header only, no need to split libraries and headers
31+ ++ lib.optional (lib.versionAtLeast version "1.4") "dev";
2932
3033 postInstall = ''
3134 mkdir -p $out/share/doc/spdlog