cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'pr-63515'

Browse source 
* pr-63515:
  nheko: 0.6.3 -> 0.6.4, mtxclient: 0.2.0 -> 0.2.1
This commit is contained in:
Léo Gaspard 2019-06-19 19:41:58 +02:00
commit a9166c763d
No known key found for this signature in database
GPG key ID: 771E7AD1170FE690
2 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/networking/instant-messengers/nheko/default.nix
View file

@ -1,8 +1,10 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient , 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 let
tweeny = fetchFromGitHub { tweeny = fetchFromGitHub {
owner = "mobius3"; owner = "mobius3";
@ -20,13 +22,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nheko-${version}"; name = "nheko-${version}";
version = "0.6.3"; version = "0.6.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nheko-Reborn"; owner = "Nheko-Reborn";
repo = "nheko"; repo = "nheko";
rev = "v${version}"; rev = "v${version}";
sha256 = "1h95lixciiq904dnfpwxhyf545yfsrphhwqyvs4yrzdfr9k0cf98"; sha256 = "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm";
}; };
# If, on Darwin, you encounter the error # If, on Darwin, you encounter the error
@ -54,6 +56,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DTWEENY_INCLUDE_DIR=.deps/include" "-DTWEENY_INCLUDE_DIR=.deps/include"
"-DLMDBXX_INCLUDE_DIR=${lmdbxx}" "-DLMDBXX_INCLUDE_DIR=${lmdbxx}"
"-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json"
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

24
pkgs/development/libraries/mtxclient/default.nix
View file

@ -3,35 +3,27 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mtxclient-${version}"; name = "mtxclient-${version}";
version = "0.2.0"; version = "0.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mujx"; owner = "Nheko-Reborn";
repo = "mtxclient"; repo = "mtxclient";
rev = "v${version}"; rev = "v${version}";
sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs"; sha256 = "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj";
}; };
patches = [ cmakeFlags = [
# remove on the next mtxclient update "-DBUILD_LIB_TESTS=OFF"
(fetchpatch { "-DBUILD_LIB_EXAMPLES=OFF"
url = "https://github.com/Nheko-Reborn/mtxclient/commit/41314809da7eb17ec00cff1795af6a528c5e904a.diff"; "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json"
sha256 = "17pzrkdhd4jr8xwd7hhyzak880k8yb9nkg3vcbyjfp5si89dha5j";
})
]; ];
postPatch = ''
ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp
'';
cmakeFlags = [ "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ boost openssl zlib libsodium olm ]; buildInputs = [ boost openssl zlib libsodium olm ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Client API library for Matrix, built on top of Boost.Asio"; 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; license = licenses.mit;
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz ];
platforms = platforms.unix; platforms = platforms.unix;