diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
| commit | 439ebf093f2779d73bc76484a36be2889cc807bf (patch) | |
| tree | 7dd3b84fb345c228165c2dae6c7cdd54b433db9e /nixpkgs/pkgs/development/libraries/mtxclient | |
| parent | d7417c2c1096b13fe903af802c7cf019fca14a7b (diff) | |
| parent | 0c0954781e257b8b0dc49341795a2fe7d96945a3 (diff) | |
| download | nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.gz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.bz2 nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.lz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.xz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.zst nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.zip | |
Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mtxclient')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mtxclient/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 15c82cb12825..3ab1e0a79749 100644 --- a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -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 ''; |