Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b807bc8a531a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 73c885246fc2
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Mar 22, 2019

  1. spectral: 2018-09-24 -> 2019-03-03 

    Recent redesign, features, fixes.

(cherry picked from commit ad3d9c0)
    @dtzWill @rnhmjoj
    dtzWill authored and rnhmjoj committed Mar 22, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    acdlite Andrew Clark
    SSH Key Fingerprint: kMgJy+7AI/mxxpuyx1Qgc7NZY55dREBRubChEAYfi7I
    Verified
    Learn about vigilant mode
    Copy the full SHA
    09255d4 View commit details

Commits on Apr 13, 2019

  1. spectral: disable darwin support 

    The build started to fail since the update to 2019-03-03.
    @rnhmjoj
    rnhmjoj committed Apr 13, 2019
    Copy the full SHA
    bb2b48c View commit details

Commits on Apr 20, 2019

  1. Merge pull request #58119 from rnhmjoj/spectral 

    [backport] spectral: 2018-09-24 -> 2019-03-03
    @timokau
    timokau authored Apr 20, 2019
    Copy the full SHA
    73c8852 View commit details
Showing with 27 additions and 11 deletions.
  1. +27 −11 pkgs/applications/networking/instant-messengers/spectral/default.nix
38 changes: 27 additions & 11 deletions pkgs/applications/networking/instant-messengers/spectral/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,49 @@
{ stdenv, fetchgit
, pkgconfig
, pkgconfig, makeWrapper
, qmake, qtbase, qtquickcontrols2, qtmultimedia
, libpulseaudio
# Not mentioned but seems needed
, qtgraphicaleffects
# Unsure but needed by similar
, qtdeclarative, qtsvg
, qtdeclarative
}:

stdenv.mkDerivation rec {
name = "spectral-${version}";
version = "2018-09-24";
let
# Following "borrowed" from yubikey-manager-qt
qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}";

inherit (stdenv) lib;

qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [
qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia
];

in stdenv.mkDerivation rec {
pname = "spectral";
version = "2019-03-03";

src = fetchgit {
url = "https://gitlab.com/b0/spectral.git";
rev = "c9d1d6887722860a52b597a0f74d0ce39c8622e1";
sha256 = "1ym8jlqls4lcq5rd81vxw1dni79fc6ph00ip8nsydl6i16fngl4c";
rev = "0473f25d38a064ee4e18203ec16eeae84fea4866";
sha256 = "1n09ginw6g0p42xj3zgxm52dvyyvj5psllv70vx21i50lvkbh9rw";
fetchSubmodules = true;
};

nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative qtsvg ]
qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];

postInstall = ''
wrapProgram $out/bin/spectral \
--set QML2_IMPORT_PATH "${qml2ImportPath}"
'';

nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]
++ 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;
platforms = with platforms; linux;
maintainers = with maintainers; [ dtzWill ];
};
}