summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2023-01-13 10:19:18 +0800
committerPeter Hoeg <peter@hoeg.com>2023-01-13 18:34:48 +0800
commit37b97ae3dd714de9a17923d004a2c5b5543dfa6d (patch)
tree7224e215b9b362a54e21ddb68b455db3cc39eb08
parent02440496496b6cda5af164ef48dcc453ca83d46e (diff)
nheko: 0.10.2 -> 0.11.0
-rw-r--r--pkgs/applications/networking/instant-messengers/nheko/default.nix78
1 files changed, 40 insertions, 38 deletions
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 50d68eeeba1c..901d476dc62c 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -1,30 +1,31 @@
{ lib
, stdenv
+, mkDerivation
, fetchFromGitHub
, cmake
, asciidoc
+, pkg-config
+, boost17x
, cmark
+, coeurl
+, curl
+, libevent
+, libsecret
, lmdb
, lmdbxx
-, libsecret
-, mkDerivation
+, mtxclient
+, nlohmann_json
+, olm
, qtbase
+, qtgraphicaleffects
+, qtimageformats
, qtkeychain
, qtmacextras
, qtmultimedia
-, qtimageformats
-, qttools
, qtquickcontrols2
-, qtgraphicaleffects
-, mtxclient
-, boost17x
+, qttools
+, re2
, spdlog
-, olm
-, pkg-config
-, nlohmann_json
-, coeurl
-, libevent
-, curl
, voipSupport ? true
, gst_all_1
, libnice
@@ -32,49 +33,50 @@
mkDerivation rec {
pname = "nheko";
- version = "0.10.2";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "nheko";
rev = "v${version}";
- sha256 = "sha256-gid8XOZ1/hMDGNbse4GYfcAdqHiySWyy4isBgcpekIQ=";
+ hash = "sha256-4Xe3eRnDkgyYB+hUP8TBWTt+m29HVtgcqVEQUUsIpCY=";
};
nativeBuildInputs = [
- lmdbxx
+ asciidoc
cmake
+ lmdbxx
pkg-config
- asciidoc
];
buildInputs = [
- nlohmann_json
- mtxclient
- olm
boost17x
+ cmark
+ coeurl
+ curl
+ libevent
libsecret
lmdb
- spdlog
- cmark
+ mtxclient
+ nlohmann_json
+ olm
qtbase
- qtmultimedia
- qtimageformats
- qttools
- qtquickcontrols2
qtgraphicaleffects
+ qtimageformats
qtkeychain
- coeurl
- libevent
- curl
+ qtmultimedia
+ qtquickcontrols2
+ qttools
+ re2
+ spdlog
] ++ lib.optional stdenv.isDarwin qtmacextras
- ++ lib.optionals voipSupport (with gst_all_1; [
- gstreamer
- gst-plugins-base
- (gst-plugins-good.override { qt5Support = true; })
- gst-plugins-bad
- libnice
- ]);
+ ++ lib.optionals voipSupport (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ (gst-plugins-good.override { qt5Support = true; })
+ gst-plugins-bad
+ libnice
+ ]);
cmakeFlags = [
"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
@@ -88,11 +90,11 @@ mkDerivation rec {
meta = with lib; {
description = "Desktop client for the Matrix protocol";
homepage = "https://github.com/Nheko-Reborn/nheko";
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ ekleog fpletz ];
platforms = platforms.all;
# Should be fixable if a higher clang version is used, see:
# https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
- broken = stdenv.targetPlatform.isDarwin;
- license = licenses.gpl3Plus;
+ broken = stdenv.hostPlatform.isDarwin;
};
}