diff options
| author | Lily Foster <lily@lily.flowers> | 2023-10-26 08:05:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-26 08:05:16 -0400 |
| commit | f0f5af262cd2d45cc8d5425a5b707bc23eb3f06c (patch) | |
| tree | 4449e8292c0138effbb8ed3ceb1aaac8d9336e0b /pkgs | |
| parent | 643419f02b5762a811c9da82011380390e18ae94 (diff) | |
| parent | e722a2712581ddb1990fae5dd4179d831982739b (diff) | |
| download | nixlib-f0f5af262cd2d45cc8d5425a5b707bc23eb3f06c.tar nixlib-f0f5af262cd2d45cc8d5425a5b707bc23eb3f06c.tar.gz nixlib-f0f5af262cd2d45cc8d5425a5b707bc23eb3f06c.tar.bz2 nixlib-f0f5af262cd2d45cc8d5425a5b707bc23eb3f06c.tar.lz nixlib-f0f5af262cd2d45cc8d5425a5b707bc23eb3f06c.tar.xz nixlib-f0f5af262cd2d45cc8d5425a5b707bc23eb3f06c.tar.zst nixlib-f0f5af262cd2d45cc8d5425a5b707bc23eb3f06c.zip | |
Merge pull request #263531 from chvp/fix/teams-for-linux-electron
teams-for-linux: use electron_27
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 5 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 2307c4db01e3..92fc2a96623e 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_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 ]} \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d36592db83e5..32606f11a506 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |