diff options
| author | Will Dietz <w@wdtz.org> | 2019-03-03 22:10:42 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-03-03 22:15:59 -0600 |
| commit | ad3d9c02041f534de029fa75f2889e56bae8084f (patch) | |
| tree | 8fdd28cc20e3c84fecbcce9c92ab1d78f7fe55a9 /pkgs/applications/networking/instant-messengers | |
| parent | 7874ca5b610e66d99d0989956f9e69d589f16315 (diff) | |
| download | nixlib-ad3d9c02041f534de029fa75f2889e56bae8084f.tar nixlib-ad3d9c02041f534de029fa75f2889e56bae8084f.tar.gz nixlib-ad3d9c02041f534de029fa75f2889e56bae8084f.tar.bz2 nixlib-ad3d9c02041f534de029fa75f2889e56bae8084f.tar.lz nixlib-ad3d9c02041f534de029fa75f2889e56bae8084f.tar.xz nixlib-ad3d9c02041f534de029fa75f2889e56bae8084f.tar.zst nixlib-ad3d9c02041f534de029fa75f2889e56bae8084f.zip | |
spectral: 2018-09-24 -> 2019-03-03
Recent redesign, features, fixes.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/spectral/default.nix | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix index 5dd8bf5f69ab..aff3cf82dc9b 100644 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -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; { |