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
This commit is contained in:
Will Dietz 2018-09-25 22:14:29 -05:00 committed by GitHub
commit a0248a0b68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 6 deletions

View file

@ -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;

View file

@ -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 ];
};
}

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "mtxclient-${version}";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "mujx";
repo = "mtxclient";
rev = "v${version}";
sha256 = "0i58y45diysayjzy5ick15356972z67dfxm0w41ay88nm42x1imp";
sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs";
};
postPatch = ''

View file

@ -16996,6 +16996,8 @@ with pkgs;
spectrwm = callPackage ../applications/window-managers/spectrwm { };
spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { };
super-productivity = callPackage ../applications/networking/super-productivity { };
wlc = callPackage ../development/libraries/wlc { };