diff options
author | Peter Hoeg <peter@hoeg.com> | 2019-08-20 16:54:45 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-20 16:54:45 +0800 |
commit | fa12335f425808f53121713f501f3335878e6901 (patch) | |
tree | 5fadc9a530756c808152bbd5bbe5e95ad4b3a9ea /pkgs/applications/networking | |
parent | 0f32b32c959faeab40c84ca84b0da471f650115a (diff) | |
parent | 5efdb54547d1aaca12a310238ec81cbba66daadd (diff) | |
download | nixlib-fa12335f425808f53121713f501f3335878e6901.tar nixlib-fa12335f425808f53121713f501f3335878e6901.tar.gz nixlib-fa12335f425808f53121713f501f3335878e6901.tar.bz2 nixlib-fa12335f425808f53121713f501f3335878e6901.tar.lz nixlib-fa12335f425808f53121713f501f3335878e6901.tar.xz nixlib-fa12335f425808f53121713f501f3335878e6901.tar.zst nixlib-fa12335f425808f53121713f501f3335878e6901.zip |
Merge pull request #67039 from peterhoeg/f/quaternion
quaternion: use qt specific mkDerivation
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/quaternion/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 1c58ae353bb3..655628308971 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,10 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, cmake +{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake , qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools , libqmatrixclient_0_5 }: let - generic = version: sha256: prefix: library: stdenv.mkDerivation rec { - name = "quaternion-${version}"; + generic = version: sha256: prefix: library: mkDerivation rec { + pname = "quaternion"; + inherit version; src = fetchFromGitHub { owner = "QMatrixClient"; @@ -13,9 +14,9 @@ let inherit sha256; }; - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain qttools library ]; + buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake qttools ]; postInstall = if stdenv.isDarwin then '' mkdir -p $out/Applications @@ -28,7 +29,7 @@ let meta = with lib; { description = "Cross-platform desktop IM client for the Matrix protocol"; - homepage = https://matrix.org/docs/projects/client/quaternion.html; + homepage = "https://matrix.org/docs/projects/client/quaternion.html"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; |