1 files changed, 28 insertions, 15 deletions

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 230825c93564..798f7302ea66 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -38,6 +38,7 @@
 , util-linux
 , pulseaudioSupport ? true
 , libpulseaudio
+, pulseaudio
 }:
 
 let
@@ -48,23 +49,23 @@ let
   # and often with different versions.  We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.1.11.39163";
-  versions.x86_64-darwin = "6.1.11.39163";
-  versions.x86_64-linux = "6.1.11.1545";
+  versions.aarch64-darwin = "6.2.5.41699";
+  versions.x86_64-darwin = "6.2.5.41699";
+  versions.x86_64-linux = "6.2.5.2440";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-xWeCiDhYPfTAJttXG5bCwhLu+bmHlcFF/s3+EACeph4=";
+      hash = "sha256-GD3WS4O8Xg2EKYS+CirXWHVjNkn3tQ6Ee5u15x218yA=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-AB+QXx6r3raymVU7rEJ9dO4CqJI9tnRF3l61vuGnqpI=";
+      hash = "sha256-8yEkB7hpvat33VCxuScsLD+zPKvqeTfK4Wx0vjyA9yY=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-wkG/fYbn3EdbVJwZQI8EcRPmHFX+4zggmfM4sHUjD8I=";
+      hash = "sha256-h+kt+Im0xv1zoLTvE+Ac9sfw1VyoAnvqFThf5/MwjHU=";
     };
   };
 
@@ -112,15 +113,16 @@ let
     libkrb5
   ] ++ lib.optional (pulseaudioSupport) libpulseaudio);
 
+  binPath = lib.makeBinPath ([ coreutils glib.dev pciutils procps util-linux ] ++ lib.optional pulseaudioSupport pulseaudio);
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "zoom";
   version = versions.${system} or throwSystem;
 
   src = srcs.${system} or throwSystem;
 
-  dontUnpack = stdenv.isLinux;
-  unpackPhase = lib.optionalString stdenv.isDarwin ''
+  dontUnpack = stdenv.hostPlatform.isLinux;
+  unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
     xar -xf $src
     zcat < zoomus.pkg/Payload | cpio -i
   '';
@@ -128,7 +130,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     makeWrapper
   ]
-  ++ lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     xar
     cpio
   ];
@@ -151,15 +153,17 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  postFixup =  lib.optionalString stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
     makeWrapper $out/Applications/zoom.us.app/Contents/MacOS/zoom.us $out/bin/zoom
-  '' + lib.optionalString stdenv.isLinux ''
+  '' + lib.optionalString stdenv.hostPlatform.isLinux ''
     # Desktop File
     substituteInPlace $out/share/applications/Zoom.desktop \
         --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom"
 
-    for i in aomhost zopen zoom ZoomLauncher; do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i
+    for i in aomhost zopen zoom ZoomLauncher ZoomWebviewHost; do
+      if [ -f $out/opt/zoom/$i ]; then
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i
+      fi
     done
 
     # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom
@@ -178,9 +182,17 @@ stdenv.mkDerivation rec {
       --unset QML2_IMPORT_PATH \
       --unset QT_PLUGIN_PATH \
       --unset QT_SCREEN_SCALE_FACTORS \
-      --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \
+      --prefix PATH : ${binPath} \
       --prefix LD_LIBRARY_PATH ":" ${libs}
 
+    if [ -f $out/opt/zoom/ZoomWebviewHost ]; then
+      wrapProgram $out/opt/zoom/ZoomWebviewHost \
+        --unset QML2_IMPORT_PATH \
+        --unset QT_PLUGIN_PATH \
+        --unset QT_SCREEN_SCALE_FACTORS \
+        --prefix LD_LIBRARY_PATH ":" ${libs}
+    fi
+
     # Backwards compatibility: we used to call it zoom-us
     ln -s $out/bin/{zoom,zoom-us}
   '';
@@ -192,6 +204,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://zoom.us/";
+    changelog = "https://support.zoom.com/hc/en/article?id=zm_kb&sysparm_article=KB0061222";
     description = "zoom.us video conferencing application";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;