Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.05] teams-for-linux: 1.9.5 -> 1.11.2; electron 30 -> 32 #351714

Merged
merged 5 commits into from
Oct 27, 2024
Merged

[Backport release-24.05] teams-for-linux: 1.9.5 -> 1.11.2; electron 30 -> 32 #351714

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afdc6d0
teams-for-linux: 1.9.5 -> 1.9.6
r-ryantm Sep 4, 2024
a2a75b0
teams-for-linux: 1.9.6 -> 1.10.2
r-ryantm Sep 15, 2024
0afbe27
teams-for-linux: 1.10.2 -> 1.11.0
r-ryantm Sep 26, 2024
e2bb6f8
teams-for-linux: 1.11.0 -> 1.11.2
khaneliman Oct 22, 2024
e8ab03f
teams-for-linux: electron 30 -> electron 32
khaneliman Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkgs/by-name/te/teams-for-linux/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@
fetchFromGitHub,
alsa-utils,
copyDesktopItems,
electron_30,
electron_32,
makeDesktopItem,
makeWrapper,
nix-update-script,
which,
}:

let
electronDist = "${electron_30}/${if stdenv.isDarwin then "Applications" else "libexec/electron"}";
electronDist = "${electron_32}/${if stdenv.isDarwin then "Applications" else "libexec/electron"}";
in
buildNpmPackage rec {
pname = "teams-for-linux";
version = "1.9.5";
version = "1.11.2";

src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "refs/tags/v${version}";
hash = "sha256-+rEGDg+/qvjCMhGHccb4p+CKOo/65RpkFT/WnCDlCgU=";
hash = "sha256-fSZ94Px0NuxUZqc9cHE6czG/VzNsWp+UXllq7kEQvtI=";
};

npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc=";
npmDepsHash = "sha256-MfPdOqxiMDsvxsS3yWukRokDitqWQpTpK407xVX461o=";

nativeBuildInputs = [
makeWrapper
Expand All @@ -49,7 +49,7 @@ buildNpmPackage rec {
-c.npmRebuild=true \
-c.asarUnpack="**/*.node" \
-c.electronDist=electron-dist \
-c.electronVersion=${electron_30.version}
-c.electronVersion=${electron_32.version}

runHook postBuild
'';
Expand All @@ -71,7 +71,7 @@ buildNpmPackage rec {
popd

# Linux needs 'aplay' for notification sounds
makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \
makeWrapper '${lib.getExe electron_32}' "$out/bin/teams-for-linux" \
--prefix PATH : ${
lib.makeBinPath [
alsa-utils
Expand Down
Loading