diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-11 02:34:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-11 02:34:23 -0400 |
| commit | aee5b1ac9420c5224dadbc35aa7b1e8e1dc7a50d (patch) | |
| tree | 95e9a2126e20f50b5c2aebdcf0b7ff9d252c5f3e /pkgs/applications/networking/instant-messengers | |
| parent | 394ef8245153fceedf21928f6175ff8bc691b71b (diff) | |
| parent | 0fd2b4761a22afc07c070fdb3c8b93b045a4f1cb (diff) | |
| download | nixlib-aee5b1ac9420c5224dadbc35aa7b1e8e1dc7a50d.tar nixlib-aee5b1ac9420c5224dadbc35aa7b1e8e1dc7a50d.tar.gz nixlib-aee5b1ac9420c5224dadbc35aa7b1e8e1dc7a50d.tar.bz2 nixlib-aee5b1ac9420c5224dadbc35aa7b1e8e1dc7a50d.tar.lz nixlib-aee5b1ac9420c5224dadbc35aa7b1e8e1dc7a50d.tar.xz nixlib-aee5b1ac9420c5224dadbc35aa7b1e8e1dc7a50d.tar.zst nixlib-aee5b1ac9420c5224dadbc35aa7b1e8e1dc7a50d.zip | |
Merge pull request #43149 from tadfisher/zoom-us
zoom-us: set qt plugin paths in wrapper
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 8 |
1 files changed, 5 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 98beced062a4..dc2bb4ba1e12 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -3,7 +3,7 @@ , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative , qtlocation, qtquickcontrols2, qtscript, qtwebchannel, qtwebengine # Runtime -, libjpeg_turbo, pciutils, procps +, libjpeg_turbo, pciutils, procps, qtimageformats , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation { buildInputs = [ dbus glib libGL libX11 libXfixes libuuid libxcb qtbase qtdeclarative qtlocation qtquickcontrols2 qtscript qtwebchannel qtwebengine - libjpeg_turbo pciutils procps + libjpeg_turbo ]; runtimeDependencies = optional pulseaudioSupport libpulseaudio; @@ -70,6 +70,8 @@ in stdenv.mkDerivation { makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix PATH : "${makeBinPath [ pciutils procps ]}" \ --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" runHook postInstall @@ -92,7 +94,7 @@ in stdenv.mkDerivation { description = "zoom.us video conferencing application"; license = stdenv.lib.licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with stdenv.lib.maintainers; [ danbst ]; + maintainers = with stdenv.lib.maintainers; [ danbst tadfisher ]; }; } |