Unverified Commit 280c094f authored by Maximilian Marx's avatar Maximilian Marx
Browse files

electron: add libpulseaudio to RPATH

parent 6a0cf40c

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

+1 −5
Original line number Diff line number Diff line
@@ -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}}"

pkgs/applications/networking/instant-messengers/webcord/default.nix

+0 −6
Original line number Diff line number Diff line
@@ -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/

pkgs/development/tools/electron/common.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 + ''