pyrox.dev
tdesktop: 2.7.1 -> 2.7.4 (#120994)
authored by Sameer Hoosen and committed by GitHub 2bd34a98 3b6d4169
+8
-8
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+8
-8
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
···
2
2
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo
3
3
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
4
4
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
5
-
, tl-expected, hunspell, glibmm
5
+
, tl-expected, hunspell, glibmm, webkitgtk
6
6
# Transitive dependencies:
7
7
, pcre, xorg, util-linux, libselinux, libsepol, epoxy
8
8
, at-spi2-core, libXtst, libthai, libdatrie
···
20
20
21
21
let
22
22
tg_owt = callPackage ./tg_owt.nix {};
23
-
tgcalls-gcc10-fix = fetchpatch { # "Fix build on GCC 10, second attempt."
24
-
url = "https://github.com/TelegramMessenger/tgcalls/commit/eded7cc540123eaf26361958b9a61c65cb2f7cfc.patch";
25
-
sha256 = "19n1hvn44pp01zc90g93vq2bcr2gdnscaj5il9f82klgh4llvjli";
23
+
webviewPatch = fetchpatch {
24
+
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/013eff77a13b6c2629a04e07a4d09dbe60c8ca48/trunk/fix-webview-includes.patch";
25
+
sha256 = "0112zaysf3f02dd4bgqc5hwg66h1bfj8r4yjzb06sfi0pl9vl96l";
26
26
};
27
27
28
28
in mkDerivation rec {
29
29
pname = "telegram-desktop";
30
-
version = "2.7.1";
30
+
version = "2.7.4";
31
31
32
32
# Telegram-Desktop with submodules
33
33
src = fetchurl {
34
34
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
35
-
sha256 = "01fxzcfz3xankmdar55ja55pb9hkvlf1plgpgjpsda9xwqgbxgs1";
35
+
sha256 = "1cigqvxa8lp79y7sp2w2izmmikxaxzrq9bh5ns3cy16z985nyllp";
36
36
};
37
37
38
38
postPatch = ''
···
40
40
--replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"'
41
41
substituteInPlace Telegram/CMakeLists.txt \
42
42
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
43
-
patch -d Telegram/ThirdParty/tgcalls/ -p1 < "${tgcalls-gcc10-fix}"
43
+
patch -d Telegram/lib_webview -p1 < "${webviewPatch}"
44
44
'';
45
45
46
46
# We want to run wrapProgram manually (with additional parameters)
···
52
52
buildInputs = [
53
53
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash
54
54
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
55
-
tl-expected hunspell glibmm
55
+
tl-expected hunspell glibmm webkitgtk
56
56
tg_owt
57
57
# Transitive dependencies:
58
58
pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy