diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2016-12-09 00:31:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 00:31:29 +0100 |
| commit | eee070e49cdafc037b57ca5c6396ba152794fe53 (patch) | |
| tree | f4676f27747cafb0a84385fb59abbfb9a5e2367f | |
| parent | 8760a7efd87c27ca8e778016fe821212d706ae73 (diff) | |
| parent | fc218766333a05c9352b386e0cbb16e1ae84bf53 (diff) | |
| download | nixlib-eee070e49cdafc037b57ca5c6396ba152794fe53.tar nixlib-eee070e49cdafc037b57ca5c6396ba152794fe53.tar.gz nixlib-eee070e49cdafc037b57ca5c6396ba152794fe53.tar.bz2 nixlib-eee070e49cdafc037b57ca5c6396ba152794fe53.tar.lz nixlib-eee070e49cdafc037b57ca5c6396ba152794fe53.tar.xz nixlib-eee070e49cdafc037b57ca5c6396ba152794fe53.tar.zst nixlib-eee070e49cdafc037b57ca5c6396ba152794fe53.zip | |
Merge pull request #20992 from dtzWill/fix/zoom-pax-qt-update
zoom-us: 2.052458.0531 -> 2.0.707090.1031, paxmark
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5f4e0ca1ee0d..4e9f00b03404 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -10,7 +10,7 @@ , libxml2 , libxslt , makeQtWrapper -, qt55 +, qt56 , sqlite , stdenv , xlibs @@ -27,15 +27,15 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; - version = "2.0.52458.0531"; + version = "2.0.70790.1031"; src = fetchurl { - url = "https://zoom.us/client/${version}/zoom_${version}_x86_64.tar.xz"; - sha256 = "16d64pn9j27v3fnh4c9i32vpkr10q1yr26w14964n0af1mv5jf7a"; + url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; + sha256 = "0kkg3bqv8zwhpxgrssa7ds00dxhdimnq2vfklgrdqn5qzbij31hd"; }; phases = [ "unpackPhase" "installPhase" ]; nativeBuildInputs = [ makeQtWrapper ]; - libPath = stdenv.lib.makeLibraryPath [ + buildInputs = [ alsaLib gcc.cc glib @@ -46,10 +46,12 @@ stdenv.mkDerivation rec { libuuid libxml2 libxslt - qt55.qtbase - qt55.qtdeclarative - qt55.qtscript - qt55.qtwebkit + qt56.qtbase + qt56.qtdeclarative + qt56.qtlocation + qt56.qtscript + qt56.qtwebchannel + qt56.qtwebengine sqlite xlibs.xcbutilkeysyms xorg.libX11 @@ -61,13 +63,15 @@ stdenv.mkDerivation rec { xorg.xcbutilimage zlib ]; + + libPath = stdenv.lib.makeLibraryPath buildInputs; + installPhase = '' mkdir -p $out/share cp -r \ application-x-zoom.png \ audio \ imageformats \ - chrome.bmp \ config-dump.sh \ dingdong1.pcm \ dingdong.pcm \ @@ -77,13 +81,7 @@ stdenv.mkDerivation rec { platforminputcontexts \ platforms \ platformthemes \ - Qt \ - QtMultimedia \ - QtQml \ - QtQuick \ - QtQuick.2 \ - QtWebKit \ - QtWebProcess \ + leave.pcm \ ring.pcm \ ring.wav \ version.txt \ @@ -98,6 +96,7 @@ stdenv.mkDerivation rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${libPath} \ $out/share/zoom + paxmark m $out/share/zoom wrapQtProgram "$out/share/zoom" mkdir -p $out/bin ln -s $out/share/zoom $out/bin/zoom-us |