From cbfb356db9f4451a5208176f147047a352257aa2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 30 Jun 2024 20:40:42 -0400 Subject: [PATCH 1/5] telegram-desktop: 5.1.8 -> 5.2.0 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.1.8...v5.2.0 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.0 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 27617f930fae..69dd0ea94334 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.1.8"; + version = "5.2.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-YTCvniC8THoz0BUM/gkr97rhbbSVQ+SCE1H3qS68lIM="; + hash = "sha256-n7FWTdI9lzaaa/t/v+uJYaU0TxLQWXvdRQFJXjeOOhQ="; }; patches = [ From 8ee2882be6d15983e5f9062c2e2b9c56eaeded28 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 1 Jul 2024 17:16:09 -0400 Subject: [PATCH 2/5] telegram-desktop: 5.2.0 -> 5.2.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.2.0...v5.2.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.1 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 69dd0ea94334..30129445b7c9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-n7FWTdI9lzaaa/t/v+uJYaU0TxLQWXvdRQFJXjeOOhQ="; + hash = "sha256-mIdndn69ty82Mv2vLlHOPf4ZEu7/5vGVabk9ohLuKMA="; }; patches = [ From 54c2f432817b677e3bc5e9e7287cc202d7c44bc8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 2 Jul 2024 16:54:42 -0400 Subject: [PATCH 3/5] telegram-desktop: 5.2.1 -> 5.2.2 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.2.1...v5.2.2 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.2 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 30129445b7c9..01e3e96e384c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-mIdndn69ty82Mv2vLlHOPf4ZEu7/5vGVabk9ohLuKMA="; + hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI="; }; patches = [ From 6127eef2f46c62ec68419e6388fa8c8da7d935d2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 2 Jul 2024 16:56:27 -0400 Subject: [PATCH 4/5] telegram-desktop: depends on LocalAuthentication on darwin platforms --- .../instant-messengers/telegram/telegram-desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 01e3e96e384c..f6941bef7edc 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -179,6 +179,7 @@ stdenv.mkDerivation rec { IOSurface Metal NaturalLanguage + LocalAuthentication libicns ]); From 74375870f565e10d2495e8fbe6524246aed34b6a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 2 Jul 2024 20:31:48 -0400 Subject: [PATCH 5/5] telegram-desktop: update patch for disabling url scheme registration --- .../telegram/telegram-desktop/default.nix | 6 +----- .../telegram/telegram-desktop/scheme.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index f6941bef7edc..b81582a65fd5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , callPackage , pkg-config , cmake @@ -79,10 +78,7 @@ stdenv.mkDerivation rec { # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary # see https://github.com/NixOS/nixpkgs/issues/218370 - (fetchpatch { - url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; - hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; - }) + ./scheme.patch ]; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch new file mode 100644 index 000000000000..58aaa8a7fcb5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch @@ -0,0 +1,12 @@ +diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp +index e3e0de6c6..d5851bd6e 100644 +--- a/Telegram/SourceFiles/core/application.cpp ++++ b/Telegram/SourceFiles/core/application.cpp +@@ -421,7 +421,6 @@ void Application::run() { + + void Application::autoRegisterUrlScheme() { + if (!OptionSkipUrlSchemeRegister.value()) { +- InvokeQueued(this, [] { RegisterUrlScheme(); }); + } + } +