ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13497 from AndersonTorres/cutegram

Browse Source 
cutegram: 2.7.0 -> 2.7.1
This commit is contained in:
Arseniy Seroka 2016-03-03 09:04:17 +03:00
commit dfbf0b27a4
4 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
View File

@ -1,31 +1,37 @@
{ stdenv, fetchFromGitHub { stdenv, fetchgit
, qtbase, qtquick1, qtmultimedia, qtquickcontrols, qtgraphicaleffects, makeQtWrapper , qtbase, qtmultimedia, qtquick1, qtquickcontrols, qtgraphicaleffects
, telegram-qml, libqtelegram-aseman-edition }: , telegram-qml, libqtelegram-aseman-edition
, gst_plugins_base, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly
, makeQtWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cutegram-${version}"; name = "cutegram-${meta.version}";
version = "2.7.0-stable";
src = fetchFromGitHub { src = fetchgit {
owner = "Aseman-Land"; url = "https://github.com/Aseman-Land/Cutegram.git";
repo = "Cutegram"; rev = "1dbe2792fb5a1760339379907f906e236c09db84";
rev = "v${version}"; sha256 = "080153bpa92jpi0zdrfajrn0yqy3jp8m4704sirbz46dv7471rzl";
sha256 = "0qhy30gb8zdrphz1b7zcnv8hmm5fd5qwlvrg7wpsh3hk5niz3zxk";
}; };
# TODO appindicator, for system tray plugin
buildInputs = [ qtbase qtquick1 qtmultimedia qtquickcontrols qtgraphicaleffects telegram-qml libqtelegram-aseman-edition ]; buildInputs =
[ qtbase qtmultimedia qtquick1 qtquickcontrols qtgraphicaleffects
telegram-qml libqtelegram-aseman-edition
gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly ];
nativeBuildInputs = [ makeQtWrapper ]; nativeBuildInputs = [ makeQtWrapper ];
enableParallelBuild = true; enableParallelBuild = true;
fixupPhase = "wrapQtProgram $out/bin/cutegram";
configurePhase = "qmake -r PREFIX=$out"; configurePhase = "qmake -r PREFIX=$out";
fixupPhase = "wrapQtProgram $out/bin/cutegram";
meta = with stdenv.lib; { meta = with stdenv.lib; {
version = "2.7.1";
description = "Telegram client forked from sigram"; description = "Telegram client forked from sigram";
homepage = "http://aseman.co/en/products/cutegram/"; homepage = "http://aseman.co/en/products/cutegram/";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = [ maintainers.profpatsch ]; maintainers = with maintainers; [ profpatsch AndersonTorres ];
}; };
} }
#TODO: appindicator, for system tray plugin (by @profpatsch)

8
pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
View File

@ -2,14 +2,13 @@
, qtbase, qtmultimedia, qtquick1 }: , qtbase, qtmultimedia, qtquick1 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libqtelegram-aseman-edition-${version}"; name = "libqtelegram-aseman-edition-${meta.version}";
version = "6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Aseman-Land"; owner = "Aseman-Land";
repo = "libqtelegram-aseman-edition"; repo = "libqtelegram-aseman-edition";
rev = "v${version}"; rev = "v${meta.version}-stable";
sha256 = "17hlxf43xwic8m06q3gwbxjpvz31ks6laffjw6ny98d45zfnfwra"; sha256 = "1pfd4pvh51639zk9shv1s4f6pf0ympnhar8a302vhrkga9i4cbx6";
}; };
buildInputs = [ qtbase qtmultimedia qtquick1 ]; buildInputs = [ qtbase qtmultimedia qtquick1 ];
@ -25,6 +24,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
version = "6.1";
description = "A fork of libqtelegram by Aseman, using qmake"; description = "A fork of libqtelegram by Aseman, using qmake";
homepage = src.meta.homepage; homepage = src.meta.homepage;
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;

10
pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
View File

@ -3,17 +3,16 @@
, libqtelegram-aseman-edition }: , libqtelegram-aseman-edition }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "telegram-qml-${version}"; name = "telegram-qml-${meta.version}";
version = "0.9.1-stable";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Aseman-Land"; owner = "Aseman-Land";
repo = "TelegramQML"; repo = "TelegramQML";
rev = "v${version}"; rev = "v${meta.version}";
sha256 = "077j06lfr6qccqv664hn0ln023xlh5cfm50kapjc2inapxj2yqmn"; sha256 = "0j8vn845f2virvddk9yjbljy6vkr9ikyn6iy7hpj8nvr2xls3499";
}; };
buildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ];
enableParallelBuild = true; enableParallelBuild = true;
patchPhase = '' patchPhase = ''
@ -26,6 +25,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
version = "0.9.2";
description = "Telegram API tools for QtQml and Qml"; description = "Telegram API tools for QtQml and Qml";
homepage = src.meta.homepage; homepage = src.meta.homepage;
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;

8
pkgs/top-level/all-packages.nix
View File

@ -11689,10 +11689,10 @@ let
cutecom = callPackage ../tools/misc/cutecom { }; cutecom = callPackage ../tools/misc/cutecom { };
cutegram = cutegram =
let cp = qt5.callPackage; let callpkg = qt55.callPackage;
in cp ../applications/networking/instant-messengers/telegram/cutegram rec { in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec {
libqtelegram-aseman-edition = cp ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { }; libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { };
telegram-qml = cp ../applications/networking/instant-messengers/telegram/telegram-qml { telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml {
inherit libqtelegram-aseman-edition; inherit libqtelegram-aseman-edition;
}; };
}; };