diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2018-01-21 17:52:26 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2018-01-21 17:52:26 +0100 |
commit | 26f86b4069bb66bfdf7ac4cfb3ebddc68a9f815f (patch) | |
tree | 419d504b860537ccd39fc952bce716eb805f8fb2 /pkgs/applications/networking/instant-messengers/telegram | |
parent | d1a04efbf7dc593903355e64e8b52cc5a6d00551 (diff) |
tdesktop: 1.2.1 -> 1.2.6
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 608d006ab3ee9..82302ad5db39a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,35 +1,42 @@ -{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake, gcc7 -, qtbase, qtimageformats -, gtk3, libappindicator-gtk3, dee -, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +{ mkDerivation, lib, fetchgit, fetchpatch +, pkgconfig, gyp, cmake, gcc7 +, qtbase, qtimageformats, gtk3, libappindicator-gtk3 +, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.2.1"; + version = "1.2.6"; # Submodules src = fetchgit { url = "git://github.com/telegramdesktop/tdesktop"; rev = "v${version}"; - sha256 = "1wgcwm9lcy9zw7jawsjj4c46p9mky611k6gjw1900llwxkfh4fh5"; + sha256 = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w"; fetchSubmodules = true; }; + # TODO: Not active anymore. tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e"; sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc"; }; - buildInputs = [ - gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip - libopus alsaLib libpulseaudio range-v3 + patches = [ + (fetchpatch { + 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 ]; - patches = [ "${tgaur}/tdesktop.patch" ]; + buildInputs = [ + qtbase qtimageformats gtk3 libappindicator-gtk3 + dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + ]; enableParallelBuilding = true; @@ -107,6 +114,6 @@ mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; homepage = https://desktop.telegram.org/; - maintainers = with maintainers; [ abbradar garbas ]; + maintainers = with maintainers; [ abbradar garbas primeos ]; }; } |