From dd0f821ea6d7e378763b2234be3e7ec6f27d95f9 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Sun, 10 Sep 2023 07:18:13 -0400 Subject: [PATCH] teams-for-linux: use electron_24 for now Upstream downgraded their own builds back to Electron 24 because of issues. Several nixpkgs users have reported that they are also having those Electron 25 issues with our packaged version, so just downgrade it for now until upstream fixes it. --- .../instant-messengers/teams-for-linux/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 c06976123816..108ac29228fa 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -8,7 +8,7 @@ , nodejs , fetchYarnDeps , fixup_yarn_lock -, electron +, electron_24 , libpulseaudio , pipewire , alsa-utils @@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline electron-builder \ --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ - -c.electronDist=${electron}/libexec/electron \ - -c.electronVersion=${electron.version} + -c.electronDist=${electron_24}/libexec/electron \ + -c.electronVersion=${electron_24.version} runHook postBuild ''; @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { 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" \ + makeWrapper '${electron_24}/bin/electron' "$out/bin/teams-for-linux" \ ${lib.optionalString stdenv.isLinux '' --prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \