git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67039 from peterhoeg/f/quaternion

quaternion: use qt specific mkDerivation

commitfa12335f425808f53121713f501f3335878e6901 authorPeter Hoeg <peter@hoeg.com> dateTue 20 Aug 2019, 16:54 (7 years ago) parent0f32b325efdb54
1 file changed+7−6
pkgs/applications/networking/instant-messengers/quaternion/default.nix+7−6
pkgs/applications/networking/instant-messengers/quaternion/default.nix+7−6
@@ -1,10 +1,11 @@
1−{ stdenv, lib, fetchFromGitHub, cmake
1+{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake
22, qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools
33, libqmatrixclient_0_5 }:
44
55let
6− generic = version: sha256: prefix: library: stdenv.mkDerivation rec {
7− name = "quaternion-${version}";
6+ generic = version: sha256: prefix: library: mkDerivation rec {
7+ pname = "quaternion";
8+ inherit version;
89
910 src = fetchFromGitHub {
1011 owner = "QMatrixClient";
@@ -13,9 +14,9 @@ let
1314 inherit sha256;
1415 };
1516
16− buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain qttools library ];
17+ buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library ];
1718
18− nativeBuildInputs = [ cmake ];
19+ nativeBuildInputs = [ cmake qttools ];
1920
2021 postInstall = if stdenv.isDarwin then ''
2122 mkdir -p $out/Applications
@@ -28,7 +29,7 @@ let
2829
2930 meta = with lib; {
3031 description = "Cross-platform desktop IM client for the Matrix protocol";
31− homepage = https://matrix.org/docs/projects/client/quaternion.html;
32+ homepage = "https://matrix.org/docs/projects/client/quaternion.html";
3233 license = licenses.gpl3;
3334 maintainers = with maintainers; [ peterhoeg ];
3435 inherit (qtbase.meta) platforms;