diff options
author | Will Dietz <github@wdtz.org> | 2018-09-25 22:14:29 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-25 22:14:29 -0500 |
commit | a0248a0b6819153e3fdbc62ce32d7f4e61695c99 (patch) | |
tree | 3100b8587ad1d8477be8f5cb5ce45d9d1ec56466 /pkgs/applications/networking/instant-messengers | |
parent | 9bfd864c592a0e1d04e0224fb4427965cba1d78d (diff) | |
parent | 3ede6674a675fb05ad3b29bde28cd179c422a8e7 (diff) | |
download | nixlib-a0248a0b6819153e3fdbc62ce32d7f4e61695c99.tar nixlib-a0248a0b6819153e3fdbc62ce32d7f4e61695c99.tar.gz nixlib-a0248a0b6819153e3fdbc62ce32d7f4e61695c99.tar.bz2 nixlib-a0248a0b6819153e3fdbc62ce32d7f4e61695c99.tar.lz nixlib-a0248a0b6819153e3fdbc62ce32d7f4e61695c99.tar.xz nixlib-a0248a0b6819153e3fdbc62ce32d7f4e61695c99.tar.zst nixlib-a0248a0b6819153e3fdbc62ce32d7f4e61695c99.zip |
Merge pull request #47365 from dtzWill/feature/matrix-clients
spectral: init at 2018-09-24; nheko: 0.5.0 -> 0.6.0 and bump dep mtxclient
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/nheko/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/spectral/default.nix | 33 |
2 files changed, 37 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 6716305df8b5..452ed70e824e 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl -, cmake, lmdb, qt5, qtmacextras, mtxclient +, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient , boost, spdlog, olm, pkgconfig }: @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.5.5"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "0k5gmfwmisfavliyz0nfsmwy317ps8a4r3l1d831giqp9pvqvi0i"; + sha256 = "1qd2c5684722jlpgqyxq6pbb1rdk1zc3sk88mkjyqypj1k0pj3dc"; }; # If, on Darwin, you encounter the error @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - mtxclient olm boost lmdb spdlog + mtxclient olm boost lmdb spdlog cmark qt5.qtbase qt5.qtmultimedia qt5.qttools ] ++ lib.optional stdenv.isDarwin qtmacextras; diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix new file mode 100644 index 000000000000..5dd8bf5f69ab --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit +, pkgconfig +, qmake, qtbase, qtquickcontrols2, qtmultimedia +, libpulseaudio +# Not mentioned but seems needed +, qtgraphicaleffects +# Unsure but needed by similar +, qtdeclarative, qtsvg +}: + +stdenv.mkDerivation rec { + name = "spectral-${version}"; + version = "2018-09-24"; + + src = fetchgit { + url = "https://gitlab.com/b0/spectral.git"; + rev = "c9d1d6887722860a52b597a0f74d0ce39c8622e1"; + sha256 = "1ym8jlqls4lcq5rd81vxw1dni79fc6ph00ip8nsydl6i16fngl4c"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative qtsvg ] + ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio; + + meta = with stdenv.lib; { + description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++"; + homepage = https://gitlab.com/b0/spectral; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ dtzWill ]; + }; +} |