diff options
| author | Lily Foster <lily@lily.flowers> | 2023-04-16 19:22:51 -0400 |
|---|---|---|
| committer | Lily Foster <lily@lily.flowers> | 2023-04-16 19:22:51 -0400 |
| commit | 6c15c20d94bbd454bdc7c8e7e8b58779409fe9ff (patch) | |
| tree | 9625daa09b9d5d86102e82a1fa9d5a794f521826 /pkgs/applications/networking/instant-messengers/teams-for-linux | |
| parent | ec5ee07b1b29070475284ada1eee05ec5b7ad821 (diff) | |
teams-for-linux: add hack fix for wayland screen-sharing
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/teams-for-linux')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch | 28 |
2 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index a38ddcd85b7cb..92fffd4a36fab 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw="; }; + 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 = '' diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch b/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch new file mode 100644 index 0000000000000..3e5d993e869ec --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch @@ -0,0 +1,28 @@ +diff --git a/app/index.js b/app/index.js +index 20ccf43..b251f62 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 { LucidLog } = require('lucid-log'); + const isDev = require('electron-is-dev'); +@@ -93,7 +93,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.on('play-notification-sound', playNotificationSound); + } + |