Unverified Commit f0f5af26 authored by Lily Foster's avatar Lily Foster Committed by GitHub
Browse files

Merge pull request #263531 from chvp/fix/teams-for-linux-electron 

teams-for-linux: use electron_27
parents 643419f0 e722a271

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

+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
, nodejs

, fetchYarnDeps

, fixup_yarn_lock

, electron_24

, electron

, libpulseaudio

, pipewire

, alsa-utils
@@ -52,8 +52,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_24}/libexec/electron \

      -c.electronVersion=${electron_24.version}

      -c.electronDist=${electron}/libexec/electron \

      -c.electronVersion=${electron.version}



    runHook postBuild

  '';
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { 
    popd



    # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing

    makeWrapper '${electron_24}/bin/electron' "$out/bin/teams-for-linux" \

    makeWrapper '${electron}/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 ]} \

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -35686,7 +35686,9 @@ with pkgs; 














  teams = callPackage ../applications/networking/instant-messengers/teams { };



























  teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { };













  teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux {













    electron = electron_27;













  };





























  teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };















  teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };