swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59256 from peterhoeg/u/quaternion

Browse source 
quaternion-git: init at 0.0.9.4-rc3
This commit is contained in:
Peter Hoeg 2019-04-28 21:51:48 +08:00 committed by GitHub
parent 2a48354da3 05dfa99d1d
commit 78bcc59d59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
pkgs/applications/networking/instant-messengers/matrique/default.nix
View file

@ -1,55 +0,0 @@
{ stdenv, fetchFromGitLab, fetchFromGitHub, qmake
, qtquickcontrols2, qtmultimedia, qtgraphicaleffects
, libqmatrixclient
}:
let
libqmatrixclient_git = libqmatrixclient.overrideDerivation (oldAttrs: {
name = "libqmatrixclient-git-for-matrique";
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "libqmatrixclient";
rev = "d9ff200f";
sha256 = "0qxkffg1499wnn8rbndq6z51sz6hiij2pkp40cvs530sl0zg0c69";
};
});
SortFilterProxyModel = fetchFromGitLab {
owner = "b0";
repo = "SortFilterProxyModel";
rev = "3c2c125c";
sha256 = "1494dvq7kiq0ymf5f9hr47pw80zv3m3dncnaw1pnzs7mhkf2s5fr";
};
in stdenv.mkDerivation rec {
name = "matrique-${version}";
version = "250";
src = fetchFromGitLab {
owner = "b0";
repo = "matrique";
rev = version;
sha256 = "0l7ag2q3l8ixczwc43igvkkl81g5s5j032gzizmgpzb1bjpdgry7";
};
postPatch = ''
rm -r include/*
ln -sf ${libqmatrixclient_git.src} include/libqmatrixclient
ln -sf ${SortFilterProxyModel} include/SortFilterProxyModel
'';
nativeBuildInputs = [ qmake ];
buildInputs = [
qtquickcontrols2 qtmultimedia qtgraphicaleffects
libqmatrixclient_git
];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "A glossy client for Matrix";
maintainers = with maintainers; [ fpletz ];
license = licenses.gpl3;
platforms = platforms.linux;
};
}

66
pkgs/applications/networking/instant-messengers/quaternion/default.nix
View file

@ -1,36 +1,42 @@
{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake
, qttools, libqmatrixclient }:
, qttools, qtmultimedia
, libqmatrixclient_0_4, libqmatrixclient_0_5 }:
stdenv.mkDerivation rec {
name = "quaternion-${version}";
version = "0.0.9.3";
let
generic = version: sha256: prefix: library: stdenv.mkDerivation rec {
name = "quaternion-${version}";
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "Quaternion";
rev = "v${version}";
sha256 = "1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3";
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "Quaternion";
rev = "${prefix}${version}";
inherit sha256;
};
buildInputs = [ qtbase qtmultimedia qtquickcontrols qttools library ];
nativeBuildInputs = [ cmake ];
postInstall = if stdenv.isDarwin then ''
mkdir -p $out/Applications
mv $out/bin/quaternion.app $out/Applications
rmdir $out/bin || :
'' else ''
substituteInPlace $out/share/applications/quaternion.desktop \
--replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
'';
meta = with lib; {
description = "Cross-platform desktop IM client for the Matrix protocol";
homepage = https://matrix.org/docs/projects/client/quaternion.html;
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
inherit (qtbase.meta) platforms;
inherit version;
};
};
buildInputs = [ qtbase qtquickcontrols qttools libqmatrixclient ];
nativeBuildInputs = [ cmake ];
postInstall = if stdenv.isDarwin then ''
mkdir -p $out/Applications
mv $out/bin/quaternion.app $out/Applications
rmdir $out/bin || :
'' else ''
substituteInPlace $out/share/applications/quaternion.desktop \
--replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
'';
meta = with lib; {
description = "Cross-platform desktop IM client for the Matrix protocol";
homepage = https://matrix.org/docs/projects/client/quaternion.html;
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
inherit (qtbase.meta) platforms;
inherit version;
};
in rec {
quaternion = generic "0.0.9.3" "1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3" "v" libqmatrixclient_0_4;
quaternion-git = generic "0.0.9.4-rc3" "1fc3ya9fr3zw1cx7565s2rswzry98avslrryvdi0qa9yn0m3sw7p" "" libqmatrixclient_0_5;
}

46
pkgs/development/libraries/libqmatrixclient/default.nix
View file

@ -1,26 +1,32 @@
{ stdenv, fetchFromGitHub, cmake
, qtbase }:
, qtbase, qtmultimedia }:
stdenv.mkDerivation rec {
name = "libqmatrixclient-${version}";
version = "0.4.2.1";
let
generic = version: sha256: prefix: stdenv.mkDerivation rec {
name = "libqmatrixclient-${version}";
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "libqmatrixclient";
rev = "v${version}";
sha256 = "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid";
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "libqmatrixclient";
rev = "${prefix}${version}";
inherit sha256;
};
buildInputs = [ qtbase qtmultimedia ];
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
description= "A Qt5 library to write cross-platfrom clients for Matrix";
homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html;
license = licenses.lgpl21;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ peterhoeg ];
};
};
buildInputs = [ qtbase ];
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
description= "A Qt5 library to write cross-platfrom clients for Matrix";
homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html;
license = licenses.lgpl21;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ peterhoeg ];
};
in rec {
libqmatrixclient_0_4 = generic "0.4.2.1" "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid" "v";
libqmatrixclient_0_5 = generic "0.5.1.2" "0vvpm1vlqfvhgfvavifrj4998g8v33hp5xjf0n8zfsmg4lxlnfg1" "";
libqmatrixclient = libqmatrixclient_0_4;
}

12
pkgs/top-level/all-packages.nix
View file

@ -1025,9 +1025,14 @@ in
charles4
;
libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };
inherit (libsForQt5.callPackage ../development/libraries/libqmatrixclient { })
libqmatrixclient_0_4
libqmatrixclient_0_5
libqmatrixclient;
quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { };
inherit (libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { })
quaternion
quaternion-git;
tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
@ -18809,7 +18814,8 @@ in
mm-common = callPackage ../development/libraries/mm-common { };
matrique = libsForQt5.callPackage ../applications/networking/instant-messengers/matrique { };
# Renamed
matrique = spectral;
mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { };