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

teams-for-linux: 1.0.45 -> 1.0.53

Browse Source 
The biggest changes are having macOS support and having a multi-account
command-line flag. See all other changes at
<https://github.com/IsmaelMartinez/teams-for-linux/compare/v1.0.45...v1.0.52>

macOS support is not currently working so it has been marked broken
after expanding `meta.platforms`.
This commit is contained in:
Lily Foster 2023-03-15 10:06:32 -04:00
parent e1e1b192c1
commit 249425ecb7
No known key found for this signature in database
GPG Key ID: 49340081E484C893
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,10 +4,10 @@
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, fixup_yarn_lock
, yarn
, nodejs
, fetchYarnDeps
, fixup_yarn_lock
, electron
, libpulseaudio
, pipewire
@ -15,18 +15,18 @@
stdenv.mkDerivation rec {
pname = "teams-for-linux";
version = "1.0.45";
version = "1.0.53";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q6DFegFrLUW/YiRyYJI4ITVVyMC5IkazlzhdR8203cY=";
sha256 = "sha256-zigcOshtRQuQxJBXPWVmTjj5+4AorR5WW8lHVInUKFg=";
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
sha256 = "sha256-jaAieO5q+tNfWN7Rp6ueasl45cfp9W1QxPdqIeCnVkE=";
yarnLock = "${src}/yarn.lock";
sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw=";
};
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
runHook preBuild
yarn --offline electron-builder \
--dir --linux ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
--dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
-c.electronDist=${electron}/lib/electron \
-c.electronVersion=${electron.version}
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out/share/{applications,teams-for-linux}
cp dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/
cp dist/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/
pushd build/icons
for image in *png; do
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
popd
makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
${lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]}"} \
--add-flags "$out/share/teams-for-linux/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
@ -88,7 +88,8 @@ stdenv.mkDerivation rec {
description = "Unofficial Microsoft Teams client for Linux";
homepage = "https://github.com/IsmaelMartinez/teams-for-linux";
license = licenses.gpl3Only;
maintainers = with maintainers; [ muscaln ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ muscaln lilyinstarlight ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}