cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #130525 from NickCao/tdesktop

Browse source 
tdesktop: 2.8.4 -> 2.8.11
This commit is contained in:
Michael Weiss 2021-07-19 15:34:03 +02:00 committed by GitHub
commit 230d8718e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage
{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc
, libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules
# Transitive dependencies:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy
@ -23,7 +23,7 @@ let
tg_owt = callPackage ./tg_owt.nix {};
in mkDerivation rec {
pname = "telegram-desktop";
version = "2.8.4";
version = "2.8.11";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -32,9 +32,17 @@ in mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-IN3GQgdNM66/GxKa5EGKB/LIkgBxS8Y4mkPBaSEphmw=";
sha256 = "020ycgb77vx7rza590i3csrvq1zgm15rvpxqqcp0xkb4yh71i3hb";
};
patches = [(fetchpatch {
# ref: https://github.com/desktop-app/lib_webview/pull/9
url = "https://github.com/desktop-app/lib_webview/commit/75e924934eee8624020befbef1f3cb5b865d3b86.patch";
sha256 = "sha256-rN4FVK4KT+xNf9IVdcpbxMqT0+t3SINJPRRQPyMiDP0=";
stripLen = 1;
extraPrefix = "Telegram/lib_webview/";
})];
postPatch = ''
substituteInPlace Telegram/CMakeLists.txt \
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
@ -49,7 +57,7 @@ in mkDerivation rec {
buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash
ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3
tl-expected hunspell glibmm webkitgtk
tl-expected hunspell glibmm webkitgtk jemalloc
libtgvoip rnnoise abseil-cpp extra-cmake-modules
tg_owt
# Transitive dependencies:

6
pkgs/development/libraries/libtgvoip/default.nix
View file

@ -7,13 +7,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "libtgvoip";
version = "unstable-2021-01-01";
version = "unstable-2021-07-13";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "libtgvoip";
rev = "13a5fcb16b04472d808ce122abd695dbf5d206cd";
sha256 = "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd";
rev = "f321e7c8cc086bac6ae06fa0934aac7d9833a310";
sha256 = "1gk5nsqhbnn1cdh83b70qr3d3v2c1bncylvgn77vvj8vnyjlmnfq";
};
# To fix the build without external webrtc: