From baee1005c9d5cf320d52be41e9ad905b2de7397b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 20 Mar 2023 10:23:06 +0800 Subject: [PATCH 1/2] tdesktop: 4.6.5 -> 4.7.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v4.6.5...v4.7.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v4.7.1 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- .../instant-messengers/telegram/tdesktop/tg_owt.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 648af9a92dec..835e2197e181 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.6.5"; + version = "4.7.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0c65ry82ffmh1qzc2lnsyjs78r9jllv62p9vglpz0ikg86zf36sk"; + sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 713069ff95a3..6e57a81dc296 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-01-05"; + version = "unstable-2023-03-14"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "5098730b9eb6173f0b52068fe2555b7c1015123a"; - sha256 = "0dnh0l9qb9q43cvm4wfgmgqp48grqqz9fb7f48nvys1b6pzhh3pk"; + rev = "1a18da2ed4d5ce134e984d1586b915738e0da257"; + sha256 = "18srnl688ng8grfpmgcjpdyr4cw87yjdvyw94b2jjq5jmnq9n3a3"; fetchSubmodules = true; }; From b6641c2209354eb38d1f52c74cf89296cd0553a0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 4 Apr 2023 09:55:34 +0800 Subject: [PATCH 2/2] tdesktop: override glibmm_2_68 to version 2.76.0 --- .../instant-messengers/telegram/tdesktop/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 835e2197e181..6b47401c5580 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , fetchpatch +, fetchurl , callPackage , pkg-config , cmake @@ -70,6 +71,13 @@ let cxxStandard = "20"; }; }; + glibmm = glibmm_2_68.overrideAttrs (_: { + version = "2.76.0"; + src = fetchurl { + url = "mirror://gnome/sources/glibmm/2.76/glibmm-2.76.0.tar.xz"; + sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI="; + }; + }); in stdenv.mkDerivation rec { pname = "telegram-desktop"; @@ -140,7 +148,7 @@ stdenv.mkDerivation rec { range-v3 tl-expected hunspell - glibmm_2_68 + glibmm webkitgtk_4_1 jemalloc rnnoise