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: 4c0f0a014b06
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 860ab9f340e9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 4, 2019

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

    Recent redesign, features, fixes.
    @dtzWill
    dtzWill committed Mar 4, 2019
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ad3d9c0 View commit details

  2. Merge pull request #56801 from dtzWill/update/spectral-2019-03-03 

    spectral: 2018-09-24 -> 2019-03-03
    @dtzWill
    dtzWill authored Mar 4, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    860ab9f View commit details
Showing with 26 additions and 10 deletions.
  1. +26 −10 pkgs/applications/networking/instant-messengers/spectral/default.nix
36 changes: 26 additions & 10 deletions pkgs/applications/networking/instant-messengers/spectral/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,42 @@
{ 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; {