From 96c0e7ffa0b460c2829e6b8f07fab23de94ee870 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 3 Nov 2024 01:10:15 +0400 Subject: [PATCH 1/3] telegram-desktop: port to new darwin SDK handling --- .../telegram/kotatogram-desktop/default.nix | 1 - .../telegram/kotatogram-desktop/macos.patch | 171 ------------------ .../telegram/telegram-desktop/default.nix | 50 +---- .../telegram/telegram-desktop/macos.patch | 145 --------------- .../telegram/telegram-desktop/tg_owt.nix | 25 +-- pkgs/top-level/all-packages.nix | 8 +- 6 files changed, 10 insertions(+), 390 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index ad1173be2ed1..8b0e8c386c9f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -41,7 +41,6 @@ }; patches = [ - ./macos.patch ./macos-opengl.patch ./macos-qt5.patch (fetchpatch { diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch deleted file mode 100644 index 941e5f80526b..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch +++ /dev/null @@ -1,171 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -index ef544803e9..69c61b3139 100644 ---- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { - [window setTitleVisibility:NSWindowTitleHidden]; - [window setTitlebarAppearsTransparent:YES]; - [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; -+#if 0 - if (@available(macOS 12.0, *)) { - _data->topNotchSkip = [[window screen] safeAreaInsets].top; - } -+#endif - } - - void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -index 7ce90d3..dac3c2c 100644 ---- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; - - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; -+#if 0 - if (@available(macOS 12.0, *)) { - [center - addObserver: _observer -@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - name: NSProcessInfoPowerStateDidChangeNotification - object: nil]; - } -+#endif - [center - addObserver: _observer - selector: @selector(powerStateChanged:) -@@ -178,11 +180,13 @@ std::optional BatterySaving::enabled() const { - return std::nullopt; - } - NSProcessInfo *info = [NSProcessInfo processInfo]; -+#if 0 - if (@available(macOS 12.0, *)) { - if ([info isLowPowerModeEnabled]) { - return true; - } - } -+#endif - const auto state = DetectBatteryState(); - if (!state.has || !state.draining) { - return false; -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -index 7521c08..5e22da2 100644 ---- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); - AudioDeviceListChangedMonitor.registerEnvironment(this); - -+#if 0 - if (@available(macOS 14.0, *)) { - const auto weak = base::make_weak(this); - id block = [^(BOOL shouldBeMuted){ -@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - setInputMuteStateChangeHandler:block - error:nil]; - } -+#endif - } - - EnvironmentMac::~EnvironmentMac() { -@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { - } - - void EnvironmentMac::setCaptureMuted(bool muted) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (!_captureMuteNotification) { - const auto value = muted ? YES : NO; - [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; - } - } -+#endif - } - - void EnvironmentMac::captureMuteSubscribe() { -+#if 0 - if (@available(macOS 14.0, *)) { - id observer = [[InputMuteObserver alloc] init]; - [[[NSWorkspace sharedWorkspace] notificationCenter] -@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { - [observer release]; - }); - } -+#endif - } - - void EnvironmentMac::captureMuteUnsubscribe() { -@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { - void EnvironmentMac::setCaptureMuteTracker( - not_null tracker, - bool track) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (track) { - if (!_captureMuteTracker) { -@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( - } - } - } -+#endif - } - - std::unique_ptr CreateEnvironment( -Submodule Telegram/lib_webview contains modified content -diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -index e7808fc..34020f0 100644 ---- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -334,6 +334,7 @@ Instance::Instance(Config config) { - _handler = [[Handler alloc] initWithMessageHandler:config.messageHandler navigationStartHandler:config.navigationStartHandler navigationDoneHandler:config.navigationDoneHandler dialogHandler:config.dialogHandler dataRequested:handleDataRequest]; - _dataRequestHandler = std::move(config.dataRequestHandler); - [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; -+#if 0 - if (@available(macOS 14, *)) { - if (config.userDataToken != LegacyStorageIdToken().toStdString()) { - NSUUID *uuid = UuidFromToken(config.userDataToken); -@@ -341,10 +342,13 @@ Instance::Instance(Config config) { - [uuid release]; - } - } -+#endif - _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]; -@@ -700,10 +704,12 @@ void *Instance::winId() { - } - - void Instance::setOpaqueBg(QColor opaqueBg) { -+#if 0 - if (@available(macOS 12.0, *)) { - [_webview setValue: @NO forKey: @"drawsBackground"]; - [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; - } -+#endif - } - - void Instance::resizeToWindow() { -@@ -739,6 +745,7 @@ std::string GenerateStorageToken() { - } - - void ClearStorageDataByToken(const std::string &token) { -+#if 0 - if (@available(macOS 14, *)) { - if (!token.empty() && token != LegacyStorageIdToken().toStdString()) { - if (NSUUID *uuid = UuidFromToken(token)) { -@@ -754,6 +761,7 @@ void ClearStorageDataByToken(const std::string &token) { - } - } - } -+#endif - } - - } // namespace Webview 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 c4de1b979195..3f177b0fab17 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -6,7 +6,6 @@ , cmake , ninja , clang -, lld , python3 , wrapQtAppsHook , tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; } @@ -38,7 +37,7 @@ , glib-networking , webkitgtk_4_1 , libicns -, darwin +, apple-sdk_15 , nix-update-script }: @@ -61,10 +60,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-frz425V5eRulNVxCf457TWQAzU/f9/szD/sx3/LYQ2Y="; }; - patches = [ - ./macos.patch - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' @@ -98,8 +93,6 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ wrapGAppsHook3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld ]; buildInputs = [ @@ -130,45 +123,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ glib-networking webkitgtk_4_1 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Cocoa - CoreFoundation - CoreServices - CoreText - CoreGraphics - CoreMedia - OpenGL - AudioUnit - ApplicationServices - Foundation - AGL - Security - SystemConfiguration - Carbon - AudioToolbox - VideoToolbox - VideoDecodeAcceleration - AVFoundation - CoreAudio - CoreVideo - CoreMediaIO - QuartzCore - AppKit - CoreWLAN - WebKit - IOKit - GSS - MediaPlayer - IOSurface - Metal - NaturalLanguage - LocalAuthentication + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 libicns - ]); - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; + ]; cmakeFlags = [ # We're allowed to used the API ID of the Snap package: diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch deleted file mode 100644 index 37b13b6844f3..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -index ef544803e9..69c61b3139 100644 ---- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { - [window setTitleVisibility:NSWindowTitleHidden]; - [window setTitlebarAppearsTransparent:YES]; - [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; -+#if 0 - if (@available(macOS 12.0, *)) { - _data->topNotchSkip = [[window screen] safeAreaInsets].top; - } -+#endif - } - - void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -index 7ce90d3..dac3c2c 100644 ---- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; - - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; -+#if 0 - if (@available(macOS 12.0, *)) { - [center - addObserver: _observer -@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - name: NSProcessInfoPowerStateDidChangeNotification - object: nil]; - } -+#endif - [center - addObserver: _observer - selector: @selector(powerStateChanged:) -@@ -178,11 +180,13 @@ std::optional BatterySaving::enabled() const { - return std::nullopt; - } - NSProcessInfo *info = [NSProcessInfo processInfo]; -+#if 0 - if (@available(macOS 12.0, *)) { - if ([info isLowPowerModeEnabled]) { - return true; - } - } -+#endif - const auto state = DetectBatteryState(); - if (!state.has || !state.draining) { - return false; -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -index 7521c08..5e22da2 100644 ---- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); - AudioDeviceListChangedMonitor.registerEnvironment(this); - -+#if 0 - if (@available(macOS 14.0, *)) { - const auto weak = base::make_weak(this); - id block = [^(BOOL shouldBeMuted){ -@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - setInputMuteStateChangeHandler:block - error:nil]; - } -+#endif - } - - EnvironmentMac::~EnvironmentMac() { -@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { - } - - void EnvironmentMac::setCaptureMuted(bool muted) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (!_captureMuteNotification) { - const auto value = muted ? YES : NO; - [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; - } - } -+#endif - } - - void EnvironmentMac::captureMuteSubscribe() { -+#if 0 - if (@available(macOS 14.0, *)) { - id observer = [[InputMuteObserver alloc] init]; - [[[NSWorkspace sharedWorkspace] notificationCenter] -@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { - [observer release]; - }); - } -+#endif - } - - void EnvironmentMac::captureMuteUnsubscribe() { -@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { - void EnvironmentMac::setCaptureMuteTracker( - not_null tracker, - bool track) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (track) { - if (!_captureMuteTracker) { -@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( - } - } - } -+#endif - } - - std::unique_ptr CreateEnvironment( -Submodule Telegram/lib_webview contains modified content -diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -index 738e574..80ff5f0 100644 ---- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -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) { -+#if 0 - if (@available(macOS 12.0, *)) { - [_webview setValue: @NO forKey: @"drawsBackground"]; - [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; - } -+#endif - } - - void Instance::resizeToWindow() { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index a0847b98139e..8fa88295de93 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -28,7 +28,7 @@ mesa, libdrm, libGL, - darwin, + apple-sdk_15, unstableGitUpdater, }: @@ -102,26 +102,9 @@ stdenv.mkDerivation { libdrm libGL ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - OpenGL - Metal - MetalKit - CoreFoundation - ApplicationServices - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + ]; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 866d077c45e2..48080f4cd306 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30264,11 +30264,7 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - stdenv = if stdenv.hostPlatform.isDarwin - then overrideSDK stdenv "11.0" - else stdenv; - }; + kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { }; @@ -32579,7 +32575,7 @@ with pkgs; telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { stdenv = if stdenv.hostPlatform.isDarwin - then overrideSDK stdenv "11.0" + then llvmPackages_19.stdenv else stdenv; }; From 503038867e968b87da255d6c348c535701739c9c Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 3 Nov 2024 01:10:31 +0400 Subject: [PATCH 2/3] kotatogram-desktop: remove macos-opengl.patch There should be no need in it since the package has switched to Qt 5 --- .../telegram/kotatogram-desktop/default.nix | 1 - .../kotatogram-desktop/macos-opengl.patch | 66 ------------------- 2 files changed, 67 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 8b0e8c386c9f..689e8d6fd12e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -41,7 +41,6 @@ }; patches = [ - ./macos-opengl.patch ./macos-qt5.patch (fetchpatch { url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch deleted file mode 100644 index e81bd53b440c..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp -index 655e7cf410..c356acbffe 100644 ---- a/Telegram/SourceFiles/media/view/media_view_pip.cpp -+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp -@@ -1333,7 +1333,7 @@ void Pip::setupStreaming() { - Ui::GL::ChosenRenderer Pip::chooseRenderer( - Ui::GL::Capabilities capabilities) { - const auto use = Platform::IsMac() -- ? true -+ ? false - : capabilities.transparency; - LOG(("OpenGL: %1 (PipPanel)").arg(Logs::b(use))); - if (use) { -Submodule Telegram/lib_ui contains modified content -diff --git a/Telegram/lib_ui/ui/gl/gl_detection.cpp b/Telegram/lib_ui/ui/gl/gl_detection.cpp -index 150eb8b..c7ce9f9 100644 ---- a/Telegram/lib_ui/ui/gl/gl_detection.cpp -+++ b/Telegram/lib_ui/ui/gl/gl_detection.cpp -@@ -236,7 +236,7 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) { - - Backend ChooseBackendDefault(Capabilities capabilities) { - const auto use = ::Platform::IsMac() -- ? true -+ ? false - : ::Platform::IsWindows() - ? capabilities.supported - : capabilities.transparency; -diff --git a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -index 7b29363..22c4fb3 100644 ---- a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -+++ b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -@@ -16,7 +16,6 @@ - #include - #include - #include --#include - #include - - @interface WindowObserver : NSObject { -@@ -138,7 +137,6 @@ public: - - private: - void init(); -- void initOpenGL(); - void resolveWeakPointers(); - void revalidateWeakPointers() const; - void initCustomTitle(); -@@ -272,10 +270,6 @@ void WindowHelper::Private::enforceStyle() { - } - } - --void WindowHelper::Private::initOpenGL() { -- auto forceOpenGL = std::make_unique(_owner->window()); --} -- - void WindowHelper::Private::resolveWeakPointers() { - if (!_owner->window()->winId()) { - _owner->window()->createWinId(); -@@ -338,7 +332,6 @@ void WindowHelper::Private::initCustomTitle() { - } - - void WindowHelper::Private::init() { -- initOpenGL(); - resolveWeakPointers(); - initCustomTitle(); - } From dc76e53a5b129b5f9783164634a49855c49930be Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 3 Nov 2024 01:11:50 +0400 Subject: [PATCH 3/3] _64gram: unbreak on darwin --- pkgs/by-name/_6/_64gram/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index b921efbf2dbc..5681c03a92b4 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -41,7 +41,6 @@ telegram-desktop.overrideAttrs (old: rec { homepage = "https://github.com/TDesktop-x64/tdesktop"; changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ clot27 ]; - mainProgram = "telegram-desktop"; - broken = stdenv.hostPlatform.isDarwin; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; }; })