spectral: 2019-03-03 -> unstable-2019-08-15

This commit is contained in:
Cole Mickens 2019-07-24 22:44:48 +02:00
parent a52c77fbea
commit bfb0ac357e

View File

@ -1,49 +1,40 @@
{ stdenv, fetchgit { stdenv, fetchgit
, pkgconfig, makeWrapper , pkgconfig, wrapQtAppsHook
, qmake, qtbase, qtquickcontrols2, qtmultimedia , cmake
, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain
, libpulseaudio , libpulseaudio
# Not mentioned but seems needed # Not mentioned but seems needed
, qtgraphicaleffects , qtgraphicaleffects
, qtdeclarative , qtdeclarative
, qtmacextras , qtmacextras
, olm, cmark
}: }:
let let qtkeychain-qt5 = qtkeychain.override {
# Following "borrowed" from yubikey-manager-qt inherit qtbase qttools;
qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; withQt5 = true;
};
inherit (stdenv) lib;
qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [
qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia
];
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "spectral"; pname = "spectral";
version = "2019-03-03"; version = "unstable-2019-08-30";
src = fetchgit { src = fetchgit {
url = "https://gitlab.com/b0/spectral.git"; url = "https://gitlab.com/b0/spectral.git";
rev = "0473f25d38a064ee4e18203ec16eeae84fea4866"; rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94";
sha256 = "1n09ginw6g0p42xj3zgxm52dvyyvj5psllv70vx21i50lvkbh9rw"; sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2";
fetchSubmodules = true; fetchSubmodules = true;
}; };
qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ]; #qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];
postInstall = '' nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
wrapProgram $out/bin/spectral \ buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ]
--set QML2_IMPORT_PATH "${qml2ImportPath}"
'';
nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]
++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++"; description = "A glossy cross-platform Matrix client.";
homepage = https://gitlab.com/b0/spectral; homepage = "https://gitlab.com/b0/spectral";
license = licenses.gpl3; license = licenses.gpl3;
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ dtzWill ]; maintainers = with maintainers; [ dtzWill ];