From 0b383bdf78349200a250fe561205d3d0a3e028c1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 19 Jun 2019 15:25:06 +0300 Subject: [PATCH] nheko: 0.6.3 -> 0.6.4, mtxclient: 0.2.0 -> 0.2.1 Use new URL of mtxclient. Make them both aware of nlohmann_json dependency using `-Dnlohmann_json_DIR` in `cmakeFlags`. --- .../instant-messengers/nheko/default.nix | 9 ++++--- .../libraries/mtxclient/default.nix | 24 +++++++------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index defec82b9169..9b1939f00516 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,8 +1,10 @@ { lib, stdenv, fetchFromGitHub , cmake, cmark, lmdb, qt5, qtmacextras, mtxclient -, boost, spdlog, olm, pkgconfig +, boost, spdlog, olm, pkgconfig, nlohmann_json }: +# These hashes and revisions are based on those from here: +# https://github.com/Nheko-Reborn/nheko/blob/v0.6.4/deps/CMakeLists.txt#L52 let tweeny = fetchFromGitHub { owner = "mobius3"; @@ -20,13 +22,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "1h95lixciiq904dnfpwxhyf545yfsrphhwqyvs4yrzdfr9k0cf98"; + sha256 = "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm"; }; # If, on Darwin, you encounter the error @@ -54,6 +56,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DTWEENY_INCLUDE_DIR=.deps/include" "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" + "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index ca0e73078a16..ee8c8f101a24 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -3,35 +3,27 @@ stdenv.mkDerivation rec { name = "mtxclient-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { - owner = "mujx"; + owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs"; + sha256 = "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj"; }; - patches = [ - # remove on the next mtxclient update - (fetchpatch { - url = "https://github.com/Nheko-Reborn/mtxclient/commit/41314809da7eb17ec00cff1795af6a528c5e904a.diff"; - sha256 = "17pzrkdhd4jr8xwd7hhyzak880k8yb9nkg3vcbyjfp5si89dha5j"; - }) + cmakeFlags = [ + "-DBUILD_LIB_TESTS=OFF" + "-DBUILD_LIB_EXAMPLES=OFF" + "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" ]; - postPatch = '' - ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp - ''; - - cmakeFlags = [ "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost openssl zlib libsodium olm ]; meta = with stdenv.lib; { description = "Client API library for Matrix, built on top of Boost.Asio"; - homepage = https://github.com/mujx/mtxclient; + homepage = https://github.com/Nheko-Reborn/mtxclient; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix;