Merge pull request #58278 from rnhmjoj/fix-nheko

mtxclient: patch to workaround matrix synapse bug
This commit is contained in:
Franz Pletz 2019-04-02 08:10:17 +00:00 committed by GitHub
commit a2f5d643b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig
, boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }:
stdenv.mkDerivation rec {
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs";
};
patches = [
# remove on the next mtxclient update
(fetchpatch {
url = "https://github.com/Nheko-Reborn/mtxclient/commit/41314809da7eb17ec00cff1795af6a528c5e904a.diff";
sha256 = "17pzrkdhd4jr8xwd7hhyzak880k8yb9nkg3vcbyjfp5si89dha5j";
})
];
postPatch = ''
ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp
'';