@@ -2,7 +2,7 @@
22, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo
33, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
44, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
5−, tl-expected, hunspell, glibmm
5+, tl-expected, hunspell, glibmm, webkitgtk
66# Transitive dependencies:
77, pcre, xorg, util-linux, libselinux, libsepol, epoxy
88, at-spi2-core, libXtst, libthai, libdatrie
@@ -20,19 +20,19 @@ with lib;
2020
2121let
2222 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";
2626 };
2727
2828in mkDerivation rec {
2929 pname = "telegram-desktop";
30− version = "2.7.1";
30+ version = "2.7.4";
3131
3232 # Telegram-Desktop with submodules
3333 src = fetchurl {
3434 url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
35− sha256 = "01fxzcfz3xankmdar55ja55pb9hkvlf1plgpgjpsda9xwqgbxgs1";
35+ sha256 = "1cigqvxa8lp79y7sp2w2izmmikxaxzrq9bh5ns3cy16z985nyllp";
3636 };
3737
3838 postPatch = ''
@@ -40,7 +40,7 @@ in mkDerivation rec {
4040 --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"'
4141 substituteInPlace Telegram/CMakeLists.txt \
4242 --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}"
4444 '';
4545
4646 # We want to run wrapProgram manually (with additional parameters)
@@ -52,7 +52,7 @@ in mkDerivation rec {
5252 buildInputs = [
5353 qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash
5454 dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
55− tl-expected hunspell glibmm
55+ tl-expected hunspell glibmm webkitgtk
5656 tg_owt
5757 # Transitive dependencies:
5858 pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy