mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 19:02:57 +00:00
Merge pull request #289801 from NickCao/telegram-desktop
telegram-desktop: 4.14.15 -> 4.15.1
This commit is contained in:
commit
6721c87afe
@ -64,14 +64,14 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "telegram-desktop";
|
pname = "telegram-desktop";
|
||||||
version = "4.14.15";
|
version = "4.15.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "telegramdesktop";
|
owner = "telegramdesktop";
|
||||||
repo = "tdesktop";
|
repo = "tdesktop";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
hash = "sha256-706FAtXS541D7H/Qc86eC1FLUWu1/tZuCq3GgJ0L/Ds=";
|
hash = "sha256-UM2+yPIu/mzPUeH71mjTaeaRvtCKPrYUKXSOht51juY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -54,7 +54,19 @@ diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram
|
|||||||
index 738e574..80ff5f0 100644
|
index 738e574..80ff5f0 100644
|
||||||
--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
|
--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
|
||||||
+++ b/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) {
|
void Instance::setOpaqueBg(QColor opaqueBg) {
|
||||||
|
Loading…
Reference in New Issue
Block a user