Merge pull request #67039 from peterhoeg/f/quaternion

quaternion: use qt specific mkDerivation
This commit is contained in:
Peter Hoeg 2019-08-20 16:54:45 +08:00 committed by GitHub
commit fa12335f42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,10 +1,11 @@
{ stdenv, lib, fetchFromGitHub, cmake { mkDerivation, stdenv, lib, fetchFromGitHub, cmake
, qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools , qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools
, libqmatrixclient_0_5 }: , libqmatrixclient_0_5 }:
let let
generic = version: sha256: prefix: library: stdenv.mkDerivation rec { generic = version: sha256: prefix: library: mkDerivation rec {
name = "quaternion-${version}"; pname = "quaternion";
inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "QMatrixClient"; owner = "QMatrixClient";
@ -13,9 +14,9 @@ let
inherit sha256; 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 '' postInstall = if stdenv.isDarwin then ''
mkdir -p $out/Applications mkdir -p $out/Applications
@ -28,7 +29,7 @@ let
meta = with lib; { meta = with lib; {
description = "Cross-platform desktop IM client for the Matrix protocol"; 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; license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
inherit (qtbase.meta) platforms; inherit (qtbase.meta) platforms;