zoom-us: fix facebook and SSO login
Turns out, zoom couldn't launch QtWebEngineProcess because of wrong interpreter Also, there was a need for some extra deps, which I found when running debug version of zoom.
This commit is contained in:
parent
7179b01199
commit
8bc737d9d3
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl, system, makeWrapper,
|
{ stdenv, fetchurl, system, makeWrapper,
|
||||||
alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
|
alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
|
||||||
libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg }:
|
libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
@ -35,6 +35,8 @@ in stdenv.mkDerivation {
|
|||||||
sqlite
|
sqlite
|
||||||
utillinux
|
utillinux
|
||||||
zlib
|
zlib
|
||||||
|
udev
|
||||||
|
expat
|
||||||
|
|
||||||
xorg.libX11
|
xorg.libX11
|
||||||
xorg.libSM
|
xorg.libSM
|
||||||
@ -51,6 +53,7 @@ in stdenv.mkDerivation {
|
|||||||
xorg.libXi
|
xorg.libXi
|
||||||
xorg.libXrender
|
xorg.libXrender
|
||||||
xorg.libXcomposite
|
xorg.libXcomposite
|
||||||
|
xorg.libXScrnSaver
|
||||||
|
|
||||||
stdenv.cc.cc
|
stdenv.cc.cc
|
||||||
];
|
];
|
||||||
@ -63,8 +66,10 @@ in stdenv.mkDerivation {
|
|||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cp -ar * $packagePath
|
cp -ar * $packagePath
|
||||||
|
|
||||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zoom
|
||||||
$packagePath/zoom
|
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess
|
||||||
|
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/qtdiag
|
||||||
|
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zopen
|
||||||
# included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53
|
# included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53
|
||||||
# it works for me without it, but, well...
|
# it works for me without it, but, well...
|
||||||
paxmark m $packagePath/zoom
|
paxmark m $packagePath/zoom
|
||||||
@ -78,6 +83,11 @@ in stdenv.mkDerivation {
|
|||||||
--set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
|
--set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
|
||||||
ln -s "$packagePath/zoom" "$out/bin/zoom-us"
|
ln -s "$packagePath/zoom" "$out/bin/zoom-us"
|
||||||
|
|
||||||
|
cat > $packagePath/qt.conf <<EOF
|
||||||
|
[Paths]
|
||||||
|
Prefix = $packagePath
|
||||||
|
EOF
|
||||||
|
|
||||||
$postInstallHooks
|
$postInstallHooks
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user