diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-05-06 09:10:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-06 09:10:17 +0000 |
| commit | 7da1dcaf5a868e95d30ed830aa351880099eaf2a (patch) | |
| tree | c92c2b73c2c9b68be21741da9707b64c7ee32fc4 /pkgs/applications/networking | |
| parent | 8ce802e8c8e99a0a7aed26e4f22725c56dd4cf80 (diff) | |
| parent | 8143383aabbc1d8049c3c3984aa998c9a64b3f47 (diff) | |
| download | nixlib-7da1dcaf5a868e95d30ed830aa351880099eaf2a.tar nixlib-7da1dcaf5a868e95d30ed830aa351880099eaf2a.tar.gz nixlib-7da1dcaf5a868e95d30ed830aa351880099eaf2a.tar.bz2 nixlib-7da1dcaf5a868e95d30ed830aa351880099eaf2a.tar.lz nixlib-7da1dcaf5a868e95d30ed830aa351880099eaf2a.tar.xz nixlib-7da1dcaf5a868e95d30ed830aa351880099eaf2a.tar.zst nixlib-7da1dcaf5a868e95d30ed830aa351880099eaf2a.zip | |
Merge pull request #40018 from danbst/zoom-us-update
zoom-us: update 2.0.106600.0904 -> 2.0.123200.0405, cleanup
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 03b4b980929c..db32dd0c23e2 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, - alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: + alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio, + utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps }: let - version = "2.0.106600.0904"; + version = "2.0.123200.0405"; srcs = { x86_64-linux = fetchurl { 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}; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ alsaLib - dbus + expat glib - gstreamer - fontconfig freetype libpulseaudio - libxml2 - libxslt - nspr - nss + zlib + dbus + fontconfig sqlite utillinux - zlib udev - expat xorg.libX11 xorg.libSM @@ -79,6 +74,7 @@ in stdenv.mkDerivation { makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ + --prefix PATH : "${procps}/bin" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" |