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 51a127446d92..705f1ffe66b0 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -4,29 +4,30 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, fixup_yarn_lock , yarn , nodejs , fetchYarnDeps +, fixup_yarn_lock , electron , libpulseaudio , pipewire +, alsa-utils }: 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 +48,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 +59,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 @@ -67,8 +68,12 @@ stdenv.mkDerivation rec { done popd + # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \ + ${lib.optionalString stdenv.isLinux '' + --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} \ + --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 +93,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; }; }