From f138622354f87364c5dfc33345e5e66f1b5d8feb Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sun, 14 Mar 2021 22:38:37 +0100
Subject: [PATCH 1/3] zoom-us: unset Qt env variables to fix dialog boxes

Zoom wouldn't show the "Participants"
dialog box when used in a plasma environment;
precisely, the dialog box failed to show its content.
The problem doesn't exist in other
environments like Gnome or Xfce.
Experiments have shown that clearing the environment variable
`QML2_IMPORT_PATH` before calling Zoom fixes the issue.

I suspect the reason to be as follows:
While the zoom build recipe is called with
`libsForQt5xx.callPackage`, putting `qttools.dev` in zoom's
`PATH` is the only connection to nixpkgs' Qt ecosystem.
Zoom brings its own Qt libraries.
Hence it seems to be a good idea to shield
zoom from access to nixpkgs' Qt files to avoid
problems from version mismatch or similar troubles.
So the commit at hand expands zoom's wrapper script
to clear the Qt-related enviornemt variables
`QML2_IMPORT_PATH` and `QT_PLUGIN_PATH`.

Original issue report, with some discussion:
https://github.com/NixOS/nixpkgs/issues/107495#issuecomment-764538071

(cherry picked from commit b747aa0f9fd6363975e90a82210275a12bfbb696)
---
 .../networking/instant-messengers/zoom-us/default.nix      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 6454f71aca0809..30514c159d3834 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -24,7 +24,6 @@
 , pciutils
 , procps
 , utillinux
-, qttools
 , pulseaudioSupport ? true, libpulseaudio ? null
 }:
 
@@ -101,9 +100,13 @@ in stdenv.mkDerivation {
     rm $out/bin/zoom
     # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect
     # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm:
+    # Also clear Qt environment variables to prevent
+    # zoom from tripping over "foreign" Qt ressources.
     makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \
       --run "cd $out/opt/zoom" \
-      --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]} \
+      --unset QML2_IMPORT_PATH \
+      --unset QT_PLUGIN_PATH \
+      --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps utillinux ]} \
       --prefix LD_LIBRARY_PATH ":" ${libs}
 
     # Backwards compatiblity: we used to call it zoom-us

From cfa926538906823a5d9d0027a13e503f8e6428e4 Mon Sep 17 00:00:00 2001
From: Ron B <me@ronthecookie.me>
Date: Mon, 8 Feb 2021 13:35:45 +0200
Subject: [PATCH 2/3] zoom-us: 5.5.6981.0202 -> 5.5.7011.0206

(cherry picked from commit a21a3bd84885c20f7736be84698595cc572c1454)
---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 30514c159d3834..37e3a6d92eb4da 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -30,11 +30,11 @@
 assert pulseaudioSupport -> libpulseaudio != null;
 
 let
-  version = "5.5.6981.0202";
+  version = "5.5.7011.0206";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
-      sha256 = "05alb81cn1vbpva5rcfwh58sjbg4f2pils4vcdgw6dvi4pbvs694";
+      sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02";
     };
   };
   dontUnpack = true;

From 80e3fe7a92b28ab144edf4eb54a3817432b1c929 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 4 Mar 2021 11:40:46 +0000
Subject: [PATCH 3/3] =?UTF-8?q?zoom-us:=205.5.7011.0206=20=E2=86=92=205.5.?=
 =?UTF-8?q?7938.0228?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 132d954d355f2224d294a8a12b15065bce7c060f)
---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 37e3a6d92eb4da..6df5ff9f973acc 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -30,11 +30,11 @@
 assert pulseaudioSupport -> libpulseaudio != null;
 
 let
-  version = "5.5.7011.0206";
+  version = "5.5.7938.0228";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
-      sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02";
+      sha256 = "KM8o2tgIn0lecOM4gKdTOdk/zsohlFqtNX+ca/S6FGY=";
     };
   };
   dontUnpack = true;