From 479c35d9563fecb73253bf63cf73c3875482807e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 22 Apr 2021 19:32:52 +0300 Subject: [PATCH] zoom-us: Use tarball again This partially reverts commit 50a7cb2cfbcce473bdda321c0c4fbc6cef0a4946, Not related to #120226. --- .../instant-messengers/zoom-us/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 67127a04978d..fd15e77c8bea 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -7,7 +7,6 @@ , atk , cairo , dbus -, dpkg , libGL , fontconfig , freetype @@ -33,8 +32,8 @@ let version = "5.6.16775.0418"; srcs = { x86_64-linux = fetchurl { - url = "https://zoom.us/client/${version}/zoom_amd64.deb"; - sha256 = "1fmzwxq8jv5k1b2kvg1ij9g6cdp1hladd8vm3cxzd8fywdjcndim"; + url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; + sha256 = "twtxzniojgyLTx6Kda8Ej96uyw2JQB/jIhLdTgTqpCo="; }; }; @@ -71,21 +70,17 @@ in stdenv.mkDerivation rec { inherit version; src = srcs.${stdenv.hostPlatform.system}; + dontUnpack = true; + nativeBuildInputs = [ - dpkg makeWrapper ]; - unpackCmd = '' - mkdir out - dpkg -x $curSrc out - ''; - installPhase = '' runHook preInstall mkdir $out - mv usr/* $out/ - mv opt $out/ + tar -C $out -xf ${src} + mv $out/usr/* $out/ runHook postInstall '';