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

Changed files
+14 -3
pkgs
applications
networking
instant-messengers
zoom-us
+14 -3
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
···
{ 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
···
sqlite
utillinux
zlib
+
udev
+
expat
xorg.libX11
xorg.libSM
···
xorg.libXi
xorg.libXrender
xorg.libXcomposite
+
xorg.libXScrnSaver
stdenv.cc.cc
];
···
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
···
# 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
'';