git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'tdesktop-updates' into master

tdesktop: 1.8.0 -> 1.8.2

commite32ee20b4053af232f8894e4a775f4c08f1ec672 authorMichael Weiss <dev.primeos@gmail.com> dateWed 21 Aug 2019, 12:07 (7 years ago) parent8a9b00f324ec3b
1 file changed+14−6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+14−6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+14−6
@@ -1,5 +1,5 @@
11{ mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch
2−, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc8
2+, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc9
33, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
44, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
55}:
@@ -7,15 +7,17 @@
77with lib;
88
99mkDerivation rec {
10− name = "telegram-desktop-${version}";
11− version = "1.8.0";
10+ pname = "telegram-desktop";
11+ version = "1.8.2";
12+ # Note: Due to our strong dependency on the Arch patches it's probably best
13+ # to also wait for the Arch update (especially if the patches don't apply).
1214
1315 # Telegram-Desktop with submodules
1416 src = fetchFromGitHub {
1517 owner = "telegramdesktop";
1618 repo = "tdesktop";
1719 rev = "v${version}";
18− sha256 = "09r62dra6gab8hiyzyysslgqkzswf8vwfkcixbcb0jk5la0m07yy";
20+ sha256 = "0dls6s8721zjm8351fcgfbsifr9d7wsxbf5dra5cbk8r555ibf3j";
1921 fetchSubmodules = true;
2022 };
2123
@@ -31,6 +33,8 @@ mkDerivation rec {
3133 sha256 = "1s5xvcp9dk0jfywssk8xfcsh7bk5xxif8xqnba0413lfx5rgvs5v";
3234 };
3335
36+ # Note: It would be best if someone could get as many patches upstream as
37+ # possible (we currently depend a lot on custom patches...).
3438 patches = [
3539 "${archPatches}/tdesktop.patch"
3640 "${archPatches}/no-gtk2.patch"
@@ -45,12 +49,12 @@ mkDerivation rec {
4549 --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
4650 '';
4751
48− nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc8 ];
49−
5052 # We want to run wrapProgram manually (with additional parameters)
5153 dontWrapGApps = true;
5254 dontWrapQtApps = true;
5355
56+ nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc9 ];
57+
5458 buildInputs = [
5559 qtbase qtimageformats gtk3 libappindicator-gtk3
5660 dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
@@ -157,6 +161,10 @@ mkDerivation rec {
157161
158162 meta = {
159163 description = "Telegram Desktop messaging app";
164+ longDescription = ''
165+ Desktop client for the Telegram messenger, based on the Telegram API and
166+ the MTProto secure protocol.
167+ '';
160168 license = licenses.gpl3;
161169 platforms = platforms.linux;
162170 homepage = https://desktop.telegram.org/;