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