electron: add libpulseaudio to RPATH

This commit is contained in:
Maximilian Marx 2024-04-16 14:59:49 +02:00
parent 6a0cf40cf4
commit 280c094f62
No known key found for this signature in database
GPG Key ID: D981CA0FF602751D
3 changed files with 3 additions and 11 deletions

View File

@ -9,9 +9,6 @@
, fetchYarnDeps
, prefetch-yarn-deps
, electron
, libnotify
, libpulseaudio
, pipewire
, alsa-utils
, which
, testers
@ -72,11 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
done
popd
# Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, 'libpipewire' for screen sharing and 'libnotify' for notifications
# Linux needs 'aplay' for notification sounds
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 libnotify ]} \
''} \
--add-flags "$out/share/teams-for-linux/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"

View File

@ -42,11 +42,6 @@ buildNpmPackage rec {
# override installPhase so we can copy the only folders that matter
installPhase =
let
libPath = lib.makeLibraryPath [
libpulseaudio
pipewire
libnotify
];
binPath = lib.makeBinPath [ xdg-utils ];
in
''
@ -62,7 +57,6 @@ buildNpmPackage rec {
# Add xdg-utils to path via suffix, per PR #181171
makeWrapper '${lib.getExe electron_29}' $out/bin/webcord \
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
--suffix PATH : "${binPath}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags $out/lib/node_modules/webcord/

View File

@ -15,6 +15,7 @@
, pkgsBuildHost
, pipewire
, libsecret
, libpulseaudio
, info
}:
@ -198,6 +199,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
pipewire
stdenv.cc.cc.lib
libsecret
libpulseaudio
];
in
base.postFixup + ''