tdesktop: 1.2.1 -> 1.2.6

This commit is contained in:
Michael Weiss 2018-01-21 17:52:26 +01:00
parent d1a04efbf7
commit 26f86b4069

View File

@ -1,35 +1,42 @@
{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake, gcc7 { mkDerivation, lib, fetchgit, fetchpatch
, qtbase, qtimageformats , pkgconfig, gyp, cmake, gcc7
, gtk3, libappindicator-gtk3, dee , qtbase, qtimageformats, gtk3, libappindicator-gtk3
, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
}: }:
mkDerivation rec { mkDerivation rec {
name = "telegram-desktop-${version}"; name = "telegram-desktop-${version}";
version = "1.2.1"; version = "1.2.6";
# Submodules # Submodules
src = fetchgit { src = fetchgit {
url = "git://github.com/telegramdesktop/tdesktop"; url = "git://github.com/telegramdesktop/tdesktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "1wgcwm9lcy9zw7jawsjj4c46p9mky611k6gjw1900llwxkfh4fh5"; sha256 = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
fetchSubmodules = true; fetchSubmodules = true;
}; };
# TODO: Not active anymore.
tgaur = fetchgit { tgaur = fetchgit {
url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e"; rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e";
sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc"; sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc";
}; };
buildInputs = [ patches = [
gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip (fetchpatch {
libopus alsaLib libpulseaudio range-v3 name = "tdesktop.patch";
url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d";
sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa";
})
]; ];
nativeBuildInputs = [ pkgconfig gyp cmake gcc7 ]; nativeBuildInputs = [ pkgconfig gyp cmake gcc7 ];
patches = [ "${tgaur}/tdesktop.patch" ]; buildInputs = [
qtbase qtimageformats gtk3 libappindicator-gtk3
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -107,6 +114,6 @@ mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;
homepage = https://desktop.telegram.org/; homepage = https://desktop.telegram.org/;
maintainers = with maintainers; [ abbradar garbas ]; maintainers = with maintainers; [ abbradar garbas primeos ];
}; };
} }