diff options
author | Léo Gaspard <leo@gaspard.io> | 2019-06-19 19:41:58 +0200 |
---|---|---|
committer | Léo Gaspard <leo@gaspard.io> | 2019-06-19 19:41:58 +0200 |
commit | a9166c763d81e5ef5bdb45ecc6c17169cea5bcaa (patch) | |
tree | bc04bd8f857a6ba87593f5d1faa54edf5b62e03a /pkgs/applications | |
parent | 38f426787fc45ed34eebed7558fe7415d3282f72 (diff) | |
parent | 0b383bdf78349200a250fe561205d3d0a3e028c1 (diff) | |
download | nixlib-a9166c763d81e5ef5bdb45ecc6c17169cea5bcaa.tar nixlib-a9166c763d81e5ef5bdb45ecc6c17169cea5bcaa.tar.gz nixlib-a9166c763d81e5ef5bdb45ecc6c17169cea5bcaa.tar.bz2 nixlib-a9166c763d81e5ef5bdb45ecc6c17169cea5bcaa.tar.lz nixlib-a9166c763d81e5ef5bdb45ecc6c17169cea5bcaa.tar.xz nixlib-a9166c763d81e5ef5bdb45ecc6c17169cea5bcaa.tar.zst nixlib-a9166c763d81e5ef5bdb45ecc6c17169cea5bcaa.zip |
Merge branch 'pr-63515'
* pr-63515: nheko: 0.6.3 -> 0.6.4, mtxclient: 0.2.0 -> 0.2.1
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/nheko/default.nix | 9 |
1 files changed, 6 insertions, 3 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 ]; |