public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zoom-us: fix runtime qt environment

Browse Source
This commit is contained in:
Tad Fisher 2018-07-12 12:03:56 -07:00
parent 4d5371f373
commit 5dc1d746cf
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -1,16 +1,18 @@
{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook, env
# Dynamic libraries # Dynamic libraries
, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative
, qtlocation, qtquickcontrols2, qtscript, qtwebchannel, qtwebengine , qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg
, qttools, qtwayland, qtwebchannel, qtwebengine
# Runtime # Runtime
, libjpeg_turbo, pciutils, procps, qtimageformats , coreutils, libjpeg_turbo, pciutils, procps, utillinux
, pulseaudioSupport ? true, libpulseaudio ? null , pulseaudioSupport ? true, libpulseaudio ? null
}: }:
assert pulseaudioSupport -> libpulseaudio != null; assert pulseaudioSupport -> libpulseaudio != null;
let let
inherit (stdenv.lib) concatStringsSep makeBinPath optional optionalString; inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath
makeSearchPath optional optionalString;
version = "2.2.128200.0702"; version = "2.2.128200.0702";
srcs = { srcs = {
@ -20,6 +22,13 @@ let
}; };
}; };
qtDeps = [
qtbase qtdeclarative qtlocation qtquickcontrols qtquickcontrols2 qtscript
qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
];
qtEnv = env "zoom-us-qt-${qtbase.version}" qtDeps;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "zoom-us-${version}"; name = "zoom-us-${version}";
@ -28,10 +37,8 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
buildInputs = [ buildInputs = [
dbus glib libGL libX11 libXfixes libuuid libxcb qtbase qtdeclarative dbus glib libGL libX11 libXfixes libuuid libxcb qtEnv libjpeg_turbo
qtlocation qtquickcontrols2 qtscript qtwebchannel qtwebengine ] ++ qtDeps;
libjpeg_turbo
];
runtimeDependencies = optional pulseaudioSupport libpulseaudio; runtimeDependencies = optional pulseaudioSupport libpulseaudio;
@ -46,7 +53,6 @@ in stdenv.mkDerivation {
"ZXMPPROOT.cer" "ZXMPPROOT.cer"
"ZoomLauncher" "ZoomLauncher"
"config-dump.sh" "config-dump.sh"
"qtdiag"
"timezones" "timezones"
"translations" "translations"
"version.txt" "version.txt"
@ -67,11 +73,10 @@ in stdenv.mkDerivation {
# TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd
ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $packagePath/libturbojpeg.so ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $packagePath/libturbojpeg.so
ln -s ${qtEnv}/bin/qt.conf $packagePath
makeWrapper $packagePath/zoom $out/bin/zoom-us \ makeWrapper $packagePath/zoom $out/bin/zoom-us \
--prefix PATH : "${makeBinPath [ pciutils procps ]}" \ --prefix PATH : "${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}" \
--set QSG_INFO 1 \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.qtCompatVersion}/plugins/platforms \
--set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} \
--run "cd $packagePath" --run "cd $packagePath"
runHook postInstall runHook postInstall