diff options
| author | Doron Behar <doron.behar@gmail.com> | 2022-05-25 17:39:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 17:39:02 +0300 |
| commit | f09dae75386bfe09e822ec0778ae829de1bb0335 (patch) | |
| tree | 0617c1d077866131ab0f6df0ceced06084118e02 | |
| parent | Merge pull request #174262 from NixOS/backport-174220-to-release-21.11 (diff) | |
| parent | zoom-us: 5.10.4.2845 -> 5.10.6.3192 on x86_64-linux (diff) | |
| download | nixpkgs-f09dae75386bfe09e822ec0778ae829de1bb0335.tar.gz | |
Merge pull request #174427 from wamserma/backport-173474-to-release-21.11
[21.11] zoom-us: 5.9.6.2225 -> 5.10.6.3192 (x86_64-linux)/5.10.4.6592 (darwin) (backport, security)
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 4aa9dbc9b10c..257a85c0a1e8 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -5,18 +5,27 @@ # 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 , libxkbcommon +, udev , zlib # Runtime , coreutils @@ -28,11 +37,20 @@ }: let - version = "5.9.6.2225"; + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + # 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.10.6.3192"; + }.${system} or throwSystem; + srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53"; + sha256 = "8QIkF5+875VFoGK6T0CROsqML6bJDG934c1gkuz8Klk="; }; }; @@ -40,28 +58,40 @@ 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 - zlib + xorg.libxshmfence xorg.xcbutilimage xorg.xcbutilkeysyms xorg.libXfixes xorg.libXtst + udev + zlib ] ++ lib.optional (pulseaudioSupport) libpulseaudio); in @@ -95,7 +125,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 |