Merge pull request #43426 from tadfisher/zoom-us

zoom-us: fix runtime qt environment

authored by Joachim F and committed by GitHub bc487708 1727513d

+18 -13
+18 -13
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
··· 1 - { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook 2 # Dynamic libraries 3 , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative 4 - , qtlocation, qtquickcontrols2, qtscript, qtwebchannel, qtwebengine 5 # Runtime 6 - , libjpeg_turbo, pciutils, procps, qtimageformats 7 , pulseaudioSupport ? true, libpulseaudio ? null 8 }: 9 10 assert pulseaudioSupport -> libpulseaudio != null; 11 12 let 13 - inherit (stdenv.lib) concatStringsSep makeBinPath optional optionalString; 14 15 version = "2.2.128200.0702"; 16 srcs = { ··· 20 }; 21 }; 22 23 in stdenv.mkDerivation { 24 name = "zoom-us-${version}"; 25 ··· 28 nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; 29 30 buildInputs = [ 31 - dbus glib libGL libX11 libXfixes libuuid libxcb qtbase qtdeclarative 32 - qtlocation qtquickcontrols2 qtscript qtwebchannel qtwebengine 33 - libjpeg_turbo 34 - ]; 35 36 runtimeDependencies = optional pulseaudioSupport libpulseaudio; 37 ··· 46 "ZXMPPROOT.cer" 47 "ZoomLauncher" 48 "config-dump.sh" 49 - "qtdiag" 50 "timezones" 51 "translations" 52 "version.txt" ··· 67 # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd 68 ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $packagePath/libturbojpeg.so 69 70 makeWrapper $packagePath/zoom $out/bin/zoom-us \ 71 - --prefix PATH : "${makeBinPath [ pciutils procps ]}" \ 72 - --set QSG_INFO 1 \ 73 - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.qtCompatVersion}/plugins/platforms \ 74 - --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} \ 75 --run "cd $packagePath" 76 77 runHook postInstall
··· 1 + { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook, env 2 # Dynamic libraries 3 , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative 4 + , qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg 5 + , qttools, qtwayland, qtwebchannel, qtwebengine 6 # Runtime 7 + , coreutils, libjpeg_turbo, pciutils, procps, utillinux 8 , pulseaudioSupport ? true, libpulseaudio ? null 9 }: 10 11 assert pulseaudioSupport -> libpulseaudio != null; 12 13 let 14 + inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath 15 + makeSearchPath optional optionalString; 16 17 version = "2.2.128200.0702"; 18 srcs = { ··· 22 }; 23 }; 24 25 + qtDeps = [ 26 + qtbase qtdeclarative qtlocation qtquickcontrols qtquickcontrols2 qtscript 27 + qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland 28 + ]; 29 + 30 + qtEnv = env "zoom-us-qt-${qtbase.version}" qtDeps; 31 + 32 in stdenv.mkDerivation { 33 name = "zoom-us-${version}"; 34 ··· 37 nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; 38 39 buildInputs = [ 40 + dbus glib libGL libX11 libXfixes libuuid libxcb qtEnv libjpeg_turbo 41 + ] ++ qtDeps; 42 43 runtimeDependencies = optional pulseaudioSupport libpulseaudio; 44 ··· 53 "ZXMPPROOT.cer" 54 "ZoomLauncher" 55 "config-dump.sh" 56 "timezones" 57 "translations" 58 "version.txt" ··· 73 # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd 74 ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $packagePath/libturbojpeg.so 75 76 + ln -s ${qtEnv}/bin/qt.conf $packagePath 77 + 78 makeWrapper $packagePath/zoom $out/bin/zoom-us \ 79 + --prefix PATH : "${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}" \ 80 --run "cd $packagePath" 81 82 runHook postInstall