Unverified Commit 2bd34a98 authored by Sameer Hoosen's avatar Sameer Hoosen Committed by GitHub
Browse files

tdesktop: 2.7.1 -> 2.7.4 (#120994)

parent 3b6d4169

pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix

+8 −8
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo

, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash

, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3

, tl-expected, hunspell, glibmm

, tl-expected, hunspell, glibmm, webkitgtk

# Transitive dependencies:

, pcre, xorg, util-linux, libselinux, libsepol, epoxy

, at-spi2-core, libXtst, libthai, libdatrie
@@ -20,19 +20,19 @@ with lib; 


let

  tg_owt = callPackage ./tg_owt.nix {};

  tgcalls-gcc10-fix = fetchpatch { # "Fix build on GCC 10, second attempt."

    url = "https://github.com/TelegramMessenger/tgcalls/commit/eded7cc540123eaf26361958b9a61c65cb2f7cfc.patch";

    sha256 = "19n1hvn44pp01zc90g93vq2bcr2gdnscaj5il9f82klgh4llvjli";

  webviewPatch = fetchpatch {

    url = "https://raw.githubusercontent.com/archlinux/svntogit-community/013eff77a13b6c2629a04e07a4d09dbe60c8ca48/trunk/fix-webview-includes.patch";

    sha256 = "0112zaysf3f02dd4bgqc5hwg66h1bfj8r4yjzb06sfi0pl9vl96l";

  };



in mkDerivation rec {

  pname = "telegram-desktop";

  version = "2.7.1";

  version = "2.7.4";



  # Telegram-Desktop with submodules

  src = fetchurl {

    url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";

    sha256 = "01fxzcfz3xankmdar55ja55pb9hkvlf1plgpgjpsda9xwqgbxgs1";

    sha256 = "1cigqvxa8lp79y7sp2w2izmmikxaxzrq9bh5ns3cy16z985nyllp";

  };



  postPatch = ''
@@ -40,7 +40,7 @@ in mkDerivation rec { 
      --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"'

    substituteInPlace Telegram/CMakeLists.txt \

      --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'

    patch -d Telegram/ThirdParty/tgcalls/ -p1 < "${tgcalls-gcc10-fix}"

    patch -d Telegram/lib_webview -p1 < "${webviewPatch}"

  '';



  # We want to run wrapProgram manually (with additional parameters)
@@ -52,7 +52,7 @@ in mkDerivation rec { 
  buildInputs = [

    qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash

    dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3

    tl-expected hunspell glibmm

    tl-expected hunspell glibmm webkitgtk

    tg_owt

    # Transitive dependencies:

    pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy