diff options
author | Doron Behar <doron.behar@gmail.com> | 2019-06-19 15:25:06 +0300 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2019-06-19 15:33:52 +0300 |
commit | 0b383bdf78349200a250fe561205d3d0a3e028c1 (patch) | |
tree | e389460c3c3a57c3cab322fda8d4875ffa0c6400 /pkgs/development/libraries/mtxclient | |
parent | 32a992af8bd3f838114427d3ec0b3035193d88c7 (diff) | |
download | nixpkgs-0b383bdf78349200a250fe561205d3d0a3e028c1.tar nixpkgs-0b383bdf78349200a250fe561205d3d0a3e028c1.tar.gz nixpkgs-0b383bdf78349200a250fe561205d3d0a3e028c1.tar.bz2 nixpkgs-0b383bdf78349200a250fe561205d3d0a3e028c1.tar.lz nixpkgs-0b383bdf78349200a250fe561205d3d0a3e028c1.tar.xz nixpkgs-0b383bdf78349200a250fe561205d3d0a3e028c1.tar.zst nixpkgs-0b383bdf78349200a250fe561205d3d0a3e028c1.zip |
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`.
Diffstat (limited to 'pkgs/development/libraries/mtxclient')
-rw-r--r-- | pkgs/development/libraries/mtxclient/default.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index ca0e73078a1..ee8c8f101a2 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; |