Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9c44146647b7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b4f2f298e18f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 27, 2020

  1. teams: fixing pulseaudio access 

    (cherry picked from commit 73e4647)
    @Mic92
    Elyhaka authored and Mic92 committed Apr 27, 2020
    Copy the full SHA
    b4f2f29 View commit details
Showing with 22 additions and 0 deletions.
  1. +22 −0 pkgs/applications/networking/instant-messengers/teams/default.nix
22 changes: 22 additions & 0 deletions pkgs/applications/networking/instant-messengers/teams/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,6 +52,28 @@ stdenv.mkDerivation rec {
ln -s $out/opt/teams/teams $out/bin/
'';

dontAutoPatchelf = true;

# Includes runtimeDependencies in the RPATH of the included Node modules
# so that dynamic loading works. We cannot use directly runtimeDependencies
# here, since the libraries from runtimeDependencies are not propagated
# to the dynamically loadable node modules because of a condition in
# autoPatchElfHook since *.node modules have Type: DYN (Shared object file)
# instead of EXEC or INTERP it expects.
# Fixes: https://github.com/NixOS/nixpkgs/issues/85449
postFixup = ''
autoPatchelf "$out"
runtime_rpath="${lib.makeLibraryPath runtimeDependencies}"
for mod in $(find "$out/opt/teams" -name '*.node'); do
mod_rpath="$(patchelf --print-rpath "$mod")"
echo "Adding runtime dependencies to RPATH of Node module $mod"
patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod"
done;
'';

meta = with stdenv.lib; {
description = "Microsoft Teams";
homepage = "https://teams.microsoft.com";