Unverified Commit 3c723251 authored by Yarek's avatar Yarek
Browse files

teams-for-linux: Remove wayland patch

The issue was fixed upstream and confirmed working without the patch.
parent 0f35a0e3
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-j5N6d270myUylDVDFQTScbsGp1wlpt5sISDJBRCV/GU=";
  };

  patches = [
    # Can be removed once Electron upstream resolves https://github.com/electron/electron/issues/36660
    ./screensharing-wayland-hack-fix.patch
  ];

  nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];

  configurePhase = ''
+0 −28
Original line number Diff line number Diff line
diff --git a/app/index.js b/app/index.js
index ea89608..98f4a90 100644
--- a/app/index.js
+++ b/app/index.js
@@ -1,4 +1,4 @@
-const { app, ipcMain, desktopCapturer, systemPreferences, powerMonitor } = require('electron');
+const { app, ipcMain, desktopCapturer, nativeImage, systemPreferences, powerMonitor } = require('electron');
 const path = require('path');
 const fs = require('fs');
 const { LucidLog } = require('lucid-log');
@@ -97,7 +97,16 @@ if (!gotTheLock) {
 	ipcMain.handle('getSystemIdleState', handleGetSystemIdleState);
 	ipcMain.handle('getZoomLevel', handleGetZoomLevel);
 	ipcMain.handle('saveZoomLevel', handleSaveZoomLevel);
-	ipcMain.handle('desktopCapturerGetSources', (event, opts) => desktopCapturer.getSources(opts));
+	ipcMain.handle('desktopCapturerGetSources', (event, opts) => process.env.XDG_SESSION_TYPE == 'wayland' ?
+		// Port wayland electron 22+ screenshare "fix" from webcord
+		Promise.resolve([{
+			id: "screen:1:0",
+			appIcon: nativeImage.createEmpty(),
+			display_id: "",
+			name: "Entire Screen",
+			thumbnail: nativeImage.createEmpty()
+		}])
+		: desktopCapturer.getSources(opts));
 	ipcMain.handle('getCustomBGList', handleGetCustomBGList);
 	ipcMain.on('play-notification-sound', playNotificationSound);
 	ipcMain.on('user-status-changed', userStatusChangedHandler);