pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #173474 from tomjnixon/zoom_rebase

authored by Doron Behar and committed by GitHub 5376ddfa f1f849af

+28 -7
unified split
+28 -7
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
··· 7 # Dynamic libraries 8 , alsa-lib 9 , atk 10 , cairo 11 , dbus 12 , libGL 13 , fontconfig 14 , freetype 15 , gtk3 16 , gdk-pixbuf 17 , glib 18 , pango 19 , wayland 20 , xorg 21 , libxkbcommon 22 , zlib 23 # Runtime 24 , coreutils ··· 33 inherit (stdenv.hostPlatform) system; 34 throwSystem = throw "Unsupported system: ${system}"; 35 36 - # Zoom versions are released at different times for each platform and linux 37 - # is stuck on 5.9.6 until https://github.com/NixOS/nixpkgs/pull/166085 is 38 - # resolved 39 version = { 40 aarch64-darwin = "5.10.4.6592"; 41 x86_64-darwin = "5.10.4.6592"; 42 - x86_64-linux = "5.9.6.2225"; 43 }.${system} or throwSystem; 44 45 srcs = { ··· 53 }; 54 x86_64-linux = fetchurl { 55 url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; 56 - sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53"; 57 }; 58 }; 59 ··· 61 # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' 62 alsa-lib 63 atk 64 cairo 65 dbus 66 libGL 67 fontconfig 68 freetype 69 gtk3 70 gdk-pixbuf 71 glib 72 pango 73 stdenv.cc.cc 74 wayland 75 xorg.libX11 76 xorg.libxcb 77 xorg.libXcomposite 78 xorg.libXext 79 libxkbcommon 80 xorg.libXrender 81 - zlib 82 xorg.xcbutilimage 83 xorg.xcbutilkeysyms 84 xorg.libXfixes 85 xorg.libXtst 86 ] ++ lib.optional (pulseaudioSupport) libpulseaudio); 87 88 in ··· 134 done 135 136 # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom 137 - wrapProgram $out/opt/zoom/zoom \ 138 --prefix LD_LIBRARY_PATH ":" ${libs} 139 140 rm $out/bin/zoom
··· 7 # Dynamic libraries 8 , alsa-lib 9 , atk 10 + , at-spi2-atk 11 + , at-spi2-core 12 , cairo 13 + , cups 14 , dbus 15 + , expat 16 + , libdrm 17 , libGL 18 , fontconfig 19 , freetype 20 , gtk3 21 , gdk-pixbuf 22 , glib 23 + , mesa 24 + , nspr 25 + , nss 26 , pango 27 , wayland 28 , xorg 29 , libxkbcommon 30 + , udev 31 , zlib 32 # Runtime 33 , coreutils ··· 42 inherit (stdenv.hostPlatform) system; 43 throwSystem = throw "Unsupported system: ${system}"; 44 45 + # Zoom versions are released at different times for each platform 46 version = { 47 aarch64-darwin = "5.10.4.6592"; 48 x86_64-darwin = "5.10.4.6592"; 49 + x86_64-linux = "5.10.4.2845"; 50 }.${system} or throwSystem; 51 52 srcs = { ··· 60 }; 61 x86_64-linux = fetchurl { 62 url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; 63 + sha256 = "9gspydrGaEjzAM0nK1u0XNm07HTupJ2wnPxCFWy+Nts="; 64 }; 65 }; 66 ··· 68 # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' 69 alsa-lib 70 atk 71 + at-spi2-atk 72 + at-spi2-core 73 cairo 74 + cups 75 dbus 76 + expat 77 + libdrm 78 libGL 79 fontconfig 80 freetype 81 gtk3 82 gdk-pixbuf 83 glib 84 + mesa 85 + nspr 86 + nss 87 pango 88 stdenv.cc.cc 89 wayland 90 xorg.libX11 91 xorg.libxcb 92 xorg.libXcomposite 93 + xorg.libXdamage 94 xorg.libXext 95 libxkbcommon 96 + xorg.libXrandr 97 xorg.libXrender 98 + xorg.libxshmfence 99 xorg.xcbutilimage 100 xorg.xcbutilkeysyms 101 xorg.libXfixes 102 xorg.libXtst 103 + udev 104 + zlib 105 ] ++ lib.optional (pulseaudioSupport) libpulseaudio); 106 107 in ··· 153 done 154 155 # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom 156 + # IPC breaks if the executable name does not end in 'zoom' 157 + mv $out/opt/zoom/zoom $out/opt/zoom/.zoom 158 + makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \ 159 --prefix LD_LIBRARY_PATH ":" ${libs} 160 161 rm $out/bin/zoom