-
-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #59256 from peterhoeg/u/quaternion
quaternion-git: init at 0.0.9.4-rc3
- Loading branch information
Showing
4 changed files
with
66 additions
and
103 deletions.
There are no files selected for viewing
55 changes: 0 additions & 55 deletions
55
pkgs/applications/networking/instant-messengers/matrique/default.nix
This file was deleted.
Oops, something went wrong.
60 changes: 33 additions & 27 deletions
60
pkgs/applications/networking/instant-messengers/quaternion/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 qtquickcontrols qttools libqmatrixclient ]; | ||
buildInputs = [ qtbase qtmultimedia qtquickcontrols qttools library ]; | ||
|
||
nativeBuildInputs = [ cmake ]; | ||
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" | ||
''; | ||
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; | ||
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; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 ]; | ||
buildInputs = [ qtbase qtmultimedia ]; | ||
|
||
nativeBuildInputs = [ cmake ]; | ||
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 ]; | ||
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; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters