From 8bc737d9d3cc56fac746deda75b5f882b49c054b Mon Sep 17 00:00:00 2001 From: danbst Date: Thu, 15 Jun 2017 15:53:41 +0300 Subject: [PATCH 1/2] 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. --- .../instant-messengers/zoom-us/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index a1e94817b24..b3ea321d300 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, system, makeWrapper, 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 @@ -35,6 +35,8 @@ in stdenv.mkDerivation { sqlite utillinux zlib + udev + expat xorg.libX11 xorg.libSM @@ -51,6 +53,7 @@ in stdenv.mkDerivation { xorg.libXi xorg.libXrender xorg.libXcomposite + xorg.libXScrnSaver stdenv.cc.cc ]; @@ -63,8 +66,10 @@ in stdenv.mkDerivation { mkdir -p $out/bin cp -ar * $packagePath - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $packagePath/zoom + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $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 # it works for me without it, but, well... paxmark m $packagePath/zoom @@ -78,6 +83,11 @@ in stdenv.mkDerivation { --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" ln -s "$packagePath/zoom" "$out/bin/zoom-us" + cat > $packagePath/qt.conf < Date: Thu, 15 Jun 2017 15:56:49 +0300 Subject: [PATCH 2/2] zoom-us: fix webcam video Webcam Logitech C270 showed black screen in zoom, but LD_PRELOADing v4l1compat.so fixed this. I hope, this wouldn't break camera for people, who were already able to see video, but I can't be 100% sure currently. --- .../networking/instant-messengers/zoom-us/default.nix | 3 ++- 1 file changed, 2 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 b3ea321d300..45fb10da391 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, system, makeWrapper, alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat }: + libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: let @@ -78,6 +78,7 @@ in stdenv.mkDerivation { # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it wrapProgram $packagePath/zoom \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ + --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"