colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #226543 from lilyinstarlight/upd/teams-for-linux-1.0.65

Browse Source 
teams-for-linux: 1.0.59 -> 1.0.65
This commit is contained in:
Nick Cao 2023-04-17 19:46:30 +08:00 committed by GitHub
commit 563741a3fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "teams-for-linux";
version = "1.0.59";
version = "1.0.65";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = pname;
rev = "v${version}";
sha256 = "sha256-82uRZEktKHMQhozG5Zpa2DFu1VZOEDBWpsbfgMzoXY8=";
sha256 = "sha256-Rj6A1h5R4w8zacoTV0WKTbTD67qwsw4zHP+KQ6h7/gs=";
};
offlineCache = fetchYarnDeps {
@ -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 = ''

28
pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch Normal file
View File

@ -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);
}

4
pkgs/top-level/all-packages.nix
View File

@ -33941,9 +33941,7 @@ with pkgs;
teams = callPackage ../applications/networking/instant-messengers/teams { };
teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux {
electron = electron_21;
};
teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { };
teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };