From 9e6fb1dcd7548375e07ac852cb7701688dfc9910 Mon Sep 17 00:00:00 2001 From: Tiago Castro Date: Tue, 28 Jul 2020 00:13:13 +0100 Subject: [PATCH] zoom-us: use libturbojpeg from the zoom-us tar itself --- .../networking/instant-messengers/zoom-us/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 78272695459..fde318c99ae 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -6,7 +6,7 @@ , qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel , qtwebengine # Runtime -, coreutils, libjpeg_turbo, faac, pciutils, procps, utillinux +, coreutils, 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 faac qtbase + dbus glib libGL libX11 libXfixes libuuid libxcb faac qtbase qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2 qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland ]; @@ -70,7 +70,7 @@ in mkDerivation { cp -ar ${files} $out/share/zoom-us # 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 + cp 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