diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/development/libraries/mtxclient | |
parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mtxclient')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/mtxclient/default.nix | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index ca0e73078a16..ef8525cf54d7 100644 --- a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -3,37 +3,33 @@ 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; + + # As of 2019-06-30, all of the dependencies are available on macOS but the + # package itself does not build. + broken = stdenv.isDarwin; }; } |