From 40bb45b83f32232c0a4977855c061d10dc02f3e6 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Tue, 16 May 2023 12:28:41 -0700 Subject: [PATCH] ftxui: 3.0.0 -> 4.1.0 Also, run unit tests. --- pkgs/development/libraries/ftxui/default.nix | 32 +++++++++----------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/ftxui/default.nix b/pkgs/development/libraries/ftxui/default.nix index 68679d262bed..f3be2b9c272e 100644 --- a/pkgs/development/libraries/ftxui/default.nix +++ b/pkgs/development/libraries/ftxui/default.nix @@ -1,44 +1,42 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doxygen +, gbenchmark , graphviz +, gtest }: stdenv.mkDerivation rec { pname = "ftxui"; - version = "3.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "ArthurSonzogni"; repo = "ftxui"; rev = "v${version}"; - sha256 = "sha256-2pCk4drYIprUKcjnrlX6WzPted7MUAp973EmAQX3RIE="; + sha256 = "sha256-6uPlJXuWcTUnpk+xe6EWDYvDLsfy7hGkEMO/2j3Dz0o="; }; - patches = [ - # Can be removed once https://github.com/ArthurSonzogni/FTXUI/pull/403 hits a stable release - (fetchpatch { - name = "fix-postevent-segfault.patch"; - url = "https://github.com/ArthurSonzogni/FTXUI/commit/f9256fa132e9d3c50ef1e1eafe2774160b38e063.patch"; - sha256 = "sha256-0040/gJcCXzL92FQLhZ2dNMJhNqXXD+UHFv4Koc07K0="; - }) - ]; - nativeBuildInputs = [ cmake doxygen graphviz ]; - cmakeFlags = [ - "-DFTXUI_BUILD_EXAMPLES=OFF" + nativeCheckInputs = [ + gbenchmark + gtest ]; - # gtest and gbenchmark don't seem to generate any binaries - doCheck = false; + cmakeFlags = [ + "-DFTXUI_BUILD_EXAMPLES=OFF" + "-DFTXUI_BUILD_DOCS=ON" + "-DFTXUI_BUILD_TESTS=ON" + ]; + + doCheck = true; meta = with lib; { homepage = "https://github.com/ArthurSonzogni/FTXUI"; @@ -46,6 +44,6 @@ stdenv.mkDerivation rec { description = "Functional Terminal User Interface library for C++"; license = licenses.mit; maintainers = [ maintainers.ivar ]; - platforms = platforms.unix; + platforms = platforms.all; }; }