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

Merge pull request #205790 from muscaln/teams-for-linux

Browse Source 
teams-for-linux: add libpulseaudio to LD_LIBRARY_PATH
This commit is contained in:
Bobby Rong 2023-01-14 17:45:04 +08:00 committed by GitHub
commit f70956c86d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,8 @@
, nodejs
, fetchYarnDeps
, electron
, libpulseaudio
, pipewire
}:
stdenv.mkDerivation rec {
@ -66,6 +68,7 @@ stdenv.mkDerivation rec {
popd
makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
--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}}"

4
pkgs/top-level/all-packages.nix
View File

@ -32680,7 +32680,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_21;
};
teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };