diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-03-09 16:20:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-09 16:20:44 -0500 |
| commit | 6721c87afecdf6b2f43667d2eaa24fa14151d19d (patch) | |
| tree | 68c104e3f640393d6d90553dfb043ce917d25768 /pkgs/applications/networking | |
| parent | a48a4fa861068e856eda73d9243ab23493762781 (diff) | |
| parent | 9709699029d470d9952bbbd8d6b60149a4d214f0 (diff) | |
| download | nixlib-6721c87afecdf6b2f43667d2eaa24fa14151d19d.tar nixlib-6721c87afecdf6b2f43667d2eaa24fa14151d19d.tar.gz nixlib-6721c87afecdf6b2f43667d2eaa24fa14151d19d.tar.bz2 nixlib-6721c87afecdf6b2f43667d2eaa24fa14151d19d.tar.lz nixlib-6721c87afecdf6b2f43667d2eaa24fa14151d19d.tar.xz nixlib-6721c87afecdf6b2f43667d2eaa24fa14151d19d.tar.zst nixlib-6721c87afecdf6b2f43667d2eaa24fa14151d19d.zip | |
Merge pull request #289801 from NickCao/telegram-desktop
telegram-desktop: 4.14.15 -> 4.15.1
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch | 14 |
2 files changed, 15 insertions, 3 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 2e270607274d..abb990e671b1 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 = "4.14.15"; + version = "4.15.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-706FAtXS541D7H/Qc86eC1FLUWu1/tZuCq3GgJ0L/Ds="; + hash = "sha256-UM2+yPIu/mzPUeH71mjTaeaRvtCKPrYUKXSOht51juY="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch index c8424359fdbf..3036af515ea3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch @@ -54,7 +54,19 @@ diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram index 738e574..80ff5f0 100644 --- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -254,10 +254,12 @@ void *Instance::winId() { +@@ -314,9 +314,11 @@ Instance::Instance(Config config) { + _dataRequestHandler = std::move(config.dataRequestHandler); + [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; + _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; ++#if 0 + if (@available(macOS 13.3, *)) { + _webview.inspectable = config.debug ? YES : NO; + } ++#endif + [_manager addScriptMessageHandler:_handler name:@"external"]; + [_webview setNavigationDelegate:_handler]; + [_webview setUIDelegate:_handler]; +@@ -658,10 +660,12 @@ void *Instance::winId() { } void Instance::setOpaqueBg(QColor opaqueBg) { |