diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index ffd04fd829ed..2a2c25e5593c 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -21,6 +21,9 @@ , olm , pkg-config , nlohmann_json +, coeurl +, libevent +, curl , voipSupport ? true , gst_all_1 , libnice @@ -28,13 +31,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-w4l91/W6F1FL+Q37qWSjYRHv4vad/10fxdKwfNeEwgw="; + sha256 = "1akhnngxkxbjwjkg5ispl6j5s2ylbcj92r3zxqqry4gbfxbjpx8k"; }; nativeBuildInputs = [ @@ -58,6 +61,9 @@ mkDerivation rec { qtquickcontrols2 qtgraphicaleffects qtkeychain + coeurl + libevent + curl ] ++ lib.optional stdenv.isDarwin qtmacextras ++ lib.optionals voipSupport (with gst_all_1; [ gstreamer diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix new file mode 100644 index 000000000000..df87210bb791 --- /dev/null +++ b/pkgs/development/libraries/coeurl/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitLab +, ninja +, pkg-config +, meson +, libevent +, curl +, spdlog +}: + +stdenv.mkDerivation rec { + pname = "coeurl"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "nheko.im"; + owner = "nheko-reborn"; + repo = pname; + rev = "v${version}"; + sha256 = "10a5klr44m2xy6law8s3s5rynk1q268fa4pkhilbn52yyv0fwajq"; + }; + + nativeBuildInputs = [ ninja pkg-config meson ]; + buildInputs = [ libevent curl spdlog ]; + + meta = with lib; { + description = "A simple async wrapper around CURL for C++"; + homepage = "https://nheko.im/nheko-reborn/coeurl"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7264ed6fe0d7..f3ad59df0ea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15888,6 +15888,8 @@ with pkgs; cmrt = callPackage ../development/libraries/cmrt { }; + coeurl = callPackage ../development/libraries/coeurl { }; + cogl = callPackage ../development/libraries/cogl { }; coin3d = callPackage ../development/libraries/coin3d { };