Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 190e79d0f381
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a90a5c51a7a3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 21, 2020

  1. zoom-us: Link libfaac to fix audio recording (#93374) 

    Fixes #93341.

Using strace reveals that zoom is attempting to load "libfaac1.so" from
its PATH. As faac provides "libfaac.so.0", solve this by linking from
there to "libfaac1.so" in zoom's output.

This is the same solution as the one we use for libjpeg_turbo.

(cherry picked from commit 903a0ca)
    @tadfisher @veprbl
    tadfisher authored and veprbl committed Jul 21, 2020
    Copy the full SHA
    a90a5c5 View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
7 changes: 5 additions & 2 deletions pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel
, qtwebengine
# Runtime
, coreutils, libjpeg_turbo, pciutils, procps, utillinux
, coreutils, libjpeg_turbo, faac, pciutils, procps, utillinux
, pulseaudioSupport ? true, libpulseaudio ? null
}:

@@ -40,7 +40,7 @@ in mkDerivation {
nativeBuildInputs = [ autoPatchelfHook ];

buildInputs = [
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo qtbase
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo faac qtbase
qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2
qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
];
@@ -73,6 +73,9 @@ in mkDerivation {
# TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd
ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $out/share/zoom-us/libturbojpeg.so
# Again, requires faac with a nonstandard filename.
ln -s $(readlink -e "${faac}/lib/libfaac.so") $out/share/zoom-us/libfaac1.so
runHook postInstall
'';