Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 19f8213a3e49
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9101fe8f6c9e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 15, 2017

  1. 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.
    @danbst
    danbst committed Jun 15, 2017
    Copy the full SHA
    8bc737d View commit details

  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.
    @danbst
    danbst committed Jun 15, 2017
    Copy the full SHA
    6d6d2fd View commit details

  3. Merge branch 'zoom-us-fix' of git://github.com/danbst/nixpkgs

    @shlevy
    shlevy committed Jun 15, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Josh-Cena Joshua Chen
    GPG key ID: C37145B818BDB68F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9101fe8 View commit details
Showing with 14 additions and 3 deletions.
  1. +14 −3 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
17 changes: 14 additions & 3 deletions pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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, libv4l }:

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
@@ -73,11 +78,17 @@ 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"
ln -s "$packagePath/zoom" "$out/bin/zoom-us"
cat > $packagePath/qt.conf <<EOF
[Paths]
Prefix = $packagePath
EOF
$postInstallHooks
'';