zoom-us: update 2.0.106600.0904 -> 2.0.123200.0405, cleanup

Apart from version update:
- remove some packages from `LD_LIBRARY_PATH`. I haven't found any
references for them. Most of them were copypasted from AUR expression
- found an implicit reference to `pidof`, in my case this caused warnings
about mismatched Glibc version. I've found implicit reference to `sh` too,
with Glibc warning too, but I don't know how to fix this, and looks like it's
only a warning
This commit is contained in:
danbst 2018-05-06 01:42:32 +03:00
parent 4feaecc23d
commit 8143383aab

View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem, { stdenv, fetchurl, system, makeWrapper, makeDesktopItem,
alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio,
libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps }:
let let
version = "2.0.106600.0904"; version = "2.0.123200.0405";
srcs = { srcs = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
sha256 = "1dcr0rqgjingjqbqv37hqjhhwy8axnjyirrnmjk44b5xnh239w9s"; sha256 = "1ifwa2xf5mw1ll2j1f39qd7mpyxpc6xj3650dmlnxf525dsm573z";
}; };
}; };
@ -17,25 +17,20 @@ in stdenv.mkDerivation {
src = srcs.${system}; src = srcs.${system};
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
alsaLib alsaLib
dbus expat
glib glib
gstreamer
fontconfig
freetype freetype
libpulseaudio libpulseaudio
libxml2 zlib
libxslt dbus
nspr fontconfig
nss
sqlite sqlite
utillinux utillinux
zlib
udev udev
expat
xorg.libX11 xorg.libX11
xorg.libSM xorg.libSM
@ -79,6 +74,7 @@ in stdenv.mkDerivation {
makeWrapper $packagePath/zoom $out/bin/zoom-us \ makeWrapper $packagePath/zoom $out/bin/zoom-us \
--prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \
--prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \
--prefix PATH : "${procps}/bin" \
--set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \
--set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
--set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"