diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 0c373604e46e..48f860c672c7 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -3,36 +3,36 @@ , fetchpatch , cmake , pkg-config -, boost17x , openssl , olm , spdlog , nlohmann_json +, coeurl +, libevent +, curl }: stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-UKroV1p7jYuNzCAFMsuUsYC/C9AZ1D4rhwpwuER39vc="; + sha256 = "0sxx7vj6a1n2d95c118pjq52707qwf16154fdvz5f4z1pq7c8dsi"; }; - # This patch should be obsolete and should stop applying the in next release. - patches = [ ./fix-compilation-with-olm-3.2.5.patch ]; + postPatch = '' + # See https://github.com/gabime/spdlog/issues/1897 + sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt + ''; cmakeFlags = [ # Network requiring tests can't be disabled individually: # https://github.com/Nheko-Reborn/mtxclient/issues/22 "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" - "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" - # Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or - # https://github.com/NixOS/nixpkgs/pull/73940 are merged - "-DBoost_NO_BOOST_CMAKE=TRUE" ]; nativeBuildInputs = [ @@ -41,13 +41,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ spdlog - boost17x + nlohmann_json openssl olm + coeurl + libevent + curl ]; meta = with lib; { - description = "Client API library for Matrix, built on top of Boost.Asio"; + description = "Client API library for the Matrix protocol."; homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; maintainers = with maintainers; [ fpletz pstn ];