From d0853a745c9771e1628ad9e7e9e3e45ea50b4af6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 4 Mar 2021 13:40:17 +0200 Subject: [PATCH 1/2] zoom-us: set src pname and version for update script Cleanup unused arguments. --- .../networking/instant-messengers/zoom-us/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index c431b5d0ce6..06c298a9000 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , makeWrapper -, fetchFromGitHub # Dynamic libraries , alsaLib , atk @@ -38,7 +37,6 @@ let sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; }; }; - dontUnpack = true; libs = lib.makeLibraryPath ([ # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' @@ -68,8 +66,10 @@ let xorg.libXtst ] ++ lib.optional (pulseaudioSupport) libpulseaudio); -in stdenv.mkDerivation { - name = "zoom-${version}"; +in stdenv.mkDerivation rec { + pname = "zoom"; + inherit version; + src = srcs.${stdenv.hostPlatform.system}; dontUnpack = true; @@ -80,7 +80,7 @@ in stdenv.mkDerivation { installPhase = '' runHook preInstall mkdir $out - tar -C $out -xf ${srcs.${stdenv.hostPlatform.system}} + tar -C $out -xf ${src} mv $out/usr/* $out/ runHook postInstall ''; From 132d954d355f2224d294a8a12b15065bce7c060f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 4 Mar 2021 11:40:46 +0000 Subject: [PATCH 2/2] =?UTF-8?q?zoom-us:=205.5.7011.0206=20=E2=86=92=205.5.?= =?UTF-8?q?7938.0228?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 06c298a9000..efb913fca73 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,11 +30,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.5.7011.0206"; + version = "5.5.7938.0228"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; + sha256 = "KM8o2tgIn0lecOM4gKdTOdk/zsohlFqtNX+ca/S6FGY="; }; };