summary refs log tree commit diff
path: root/pkgs/applications/networking
diff options
context:
space:
mode:
authordanbst <abcz2.uprola@gmail.com>2018-05-06 01:42:32 +0300
committerdanbst <abcz2.uprola@gmail.com>2018-05-06 01:42:32 +0300
commit8143383aabbc1d8049c3c3984aa998c9a64b3f47 (patch)
tree2d43cb135ea1bb39478c372ff8bb2c335a46ab9f /pkgs/applications/networking
parent4feaecc23de45b37a3ca1f4b886b951d0be6d8f1 (diff)
downloadnixpkgs-8143383aabbc1d8049c3c3984aa998c9a64b3f47.tar
nixpkgs-8143383aabbc1d8049c3c3984aa998c9a64b3f47.tar.gz
nixpkgs-8143383aabbc1d8049c3c3984aa998c9a64b3f47.tar.bz2
nixpkgs-8143383aabbc1d8049c3c3984aa998c9a64b3f47.tar.lz
nixpkgs-8143383aabbc1d8049c3c3984aa998c9a64b3f47.tar.xz
nixpkgs-8143383aabbc1d8049c3c3984aa998c9a64b3f47.tar.zst
nixpkgs-8143383aabbc1d8049c3c3984aa998c9a64b3f47.zip
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
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r--pkgs/applications/networking/instant-messengers/zoom-us/default.nix24
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 03b4b980929..db32dd0c23e 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"