From bb17d93a56ae3bc47255c6f2136f56afee87d231 Mon Sep 17 00:00:00 2001 From: Thomas Nixon Date: Fri, 25 Mar 2022 02:38:23 +0000 Subject: [PATCH 1/4] zoom-us: 5.9.6.2225 -> 5.10.4.2845 on x86_64-linux --- .../networking/instant-messengers/zoom-us/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index db38a2d0e86..6d74b2ee121 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -33,13 +33,11 @@ let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - # Zoom versions are released at different times for each platform and linux - # is stuck on 5.9.6 until https://github.com/NixOS/nixpkgs/pull/166085 is - # resolved + # Zoom versions are released at different times for each platform version = { aarch64-darwin = "5.10.4.6592"; x86_64-darwin = "5.10.4.6592"; - x86_64-linux = "5.9.6.2225"; + x86_64-linux = "5.10.4.2845"; }.${system} or throwSystem; srcs = { @@ -53,7 +51,7 @@ let }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53"; + sha256 = "9gspydrGaEjzAM0nK1u0XNm07HTupJ2wnPxCFWy+Nts="; }; }; From 5791f1c43f97a00ed4c6daf2394e759448620636 Mon Sep 17 00:00:00 2001 From: Clemens Lutz Date: Mon, 28 Mar 2022 16:17:59 +0200 Subject: [PATCH 2/4] zoom-us: Update dependencies --- .../instant-messengers/zoom-us/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 6d74b2ee121..5445ed88f55 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -7,14 +7,22 @@ # Dynamic libraries , alsa-lib , atk +, at-spi2-atk +, at-spi2-core , cairo +, cups , dbus +, expat +, libdrm , libGL , fontconfig , freetype , gtk3 , gdk-pixbuf , glib +, mesa +, nspr +, nss , pango , wayland , xorg @@ -59,23 +67,34 @@ let # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' alsa-lib atk + at-spi2-atk + at-spi2-core cairo + cups dbus + expat + libdrm libGL fontconfig freetype gtk3 gdk-pixbuf glib + mesa + nspr + nss pango stdenv.cc.cc wayland xorg.libX11 xorg.libxcb xorg.libXcomposite + xorg.libXdamage xorg.libXext libxkbcommon + xorg.libXrandr xorg.libXrender + xorg.libxshmfence zlib xorg.xcbutilimage xorg.xcbutilkeysyms From 215155b44065e6b2652535f720fa04ac20e8980f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 4 Apr 2022 14:00:40 -0500 Subject: [PATCH 3/4] zoom: add dep for udev, fix launching --- .../networking/instant-messengers/zoom-us/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5445ed88f55..4a4fc1d28e7 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -27,6 +27,7 @@ , wayland , xorg , libxkbcommon +, udev , zlib # Runtime , coreutils @@ -95,11 +96,12 @@ let xorg.libXrandr xorg.libXrender xorg.libxshmfence - zlib xorg.xcbutilimage xorg.xcbutilkeysyms xorg.libXfixes xorg.libXtst + udev + zlib ] ++ lib.optional (pulseaudioSupport) libpulseaudio); in From fa585a07f65f4ee954758c67db6c75463a6f6560 Mon Sep 17 00:00:00 2001 From: Thomas Nixon Date: Mon, 16 May 2022 18:32:31 +0100 Subject: [PATCH 4/4] zoom-us: change wrapper name to fix IPC --- .../networking/instant-messengers/zoom-us/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 4a4fc1d28e7..1b15c2aa0cc 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -153,7 +153,9 @@ stdenv.mkDerivation rec { done # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom - wrapProgram $out/opt/zoom/zoom \ + # IPC breaks if the executable name does not end in 'zoom' + mv $out/opt/zoom/zoom $out/opt/zoom/.zoom + makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \ --prefix LD_LIBRARY_PATH ":" ${libs} rm $out/bin/zoom