From d7de691b1ba369e12936d7250d4269f2cb8c7a05 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 14 Oct 2020 10:24:55 -0400 Subject: [PATCH 1/2] spdlog: run tests Build & run tests built into spdlog. --- pkgs/development/libraries/spdlog/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 9787c7e92da..0638ec47c55 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -15,7 +15,11 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" ]; + cmakeFlags = [ + "-DSPDLOG_BUILD_EXAMPLE=OFF" + "-DSPDLOG_BUILD_BENCH=OFF" + "-DSPDLOG_BUILD_TESTS=ON" + ]; outputs = [ "out" "doc" ]; @@ -24,6 +28,8 @@ let cp -rv ../example $out/share/doc/spdlog ''; + doCheck = true; + meta = with stdenv.lib; { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; From c19f3623a2453a8a7c810a875e09dea08ef42f97 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 14 Oct 2020 15:32:17 -0400 Subject: [PATCH 2/2] spdlog: build shared library --- pkgs/development/libraries/spdlog/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 0638ec47c55..2022ec7caaa 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -16,6 +16,7 @@ let nativeBuildInputs = [ cmake ]; cmakeFlags = [ + "-DSPDLOG_BUILD_SHARED=ON" "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_TESTS=ON" @@ -29,6 +30,7 @@ let ''; doCheck = true; + preCheck = "export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH"; meta = with stdenv.lib; { description = "Very fast, header only, C++ logging library";