Merge pull request #94039 from tiagolobocastro/zoom_libturbojpeg

zoom-us: use libturbojpeg from the zoom-us tar itself
This commit is contained in:
Daniël de Kok 2020-07-30 09:15:46 +02:00 committed by GitHub
commit 8f81e358a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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