Merge pull request #180738 from NixOS/backport-178587-to-release-22.05

8 files changed, 40 insertions, 12 deletions

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix
new file mode 100644
index 000000000000..9b4a21cb7d28
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-sha.nix
@@ -0,0 +1 @@
+"0cwplzza8vv4nzxf35i2p4gfnna4dpgp0ddqbpdxl8cxrikq5rji"
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix
new file mode 100644
index 000000000000..4fd4c471b3cf
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/arm64-darwin-version.nix
@@ -0,0 +1 @@
+"5.11.1.8356"
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 06f9a2d3e8ee..7f7df91582fb 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, pipewire
 , makeWrapper
 , xar
 , cpio
@@ -44,23 +45,23 @@ let
 
   # Zoom versions are released at different times for each platform
   version = {
-    aarch64-darwin = "5.10.4.6592";
-    x86_64-darwin = "5.10.4.6592";
-    x86_64-linux = "5.10.6.3192";
+    aarch64-darwin =import ./arm64-darwin-version.nix;
+    x86_64-darwin = import ./x86_64-darwin-version.nix;
+    x86_64-linux = import ./x86_64-linux-version.nix;
    }.${system} or throwSystem;
 
   srcs = {
     aarch64-darwin = fetchurl {
-       url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64";
-       sha256 = "0jg5f9hvb67hhfnifpx5fzz65fcijldy1znlia6pqflxwci3m5rq";
+      url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64";
+      sha256 = import ./arm64-darwin-sha.nix;
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${version}/Zoom.pkg";
-      sha256 = "1p83691bid8kz5mw09x6l9zvjglfszi5vbhfmbbpiqhiqcxlfz83";
+      sha256 = import ./x86_64-darwin-sha.nix;
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
-      sha256 = "8QIkF5+875VFoGK6T0CROsqML6bJDG934c1gkuz8Klk=";
+      sha256 = import ./x86_64-linux-sha.nix;
     };
   };
 
@@ -76,6 +77,7 @@ let
     expat
     libdrm
     libGL
+    pipewire
     fontconfig
     freetype
     gtk3
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
index 3ec1cccd0d64..6d9b50252d12 100755
--- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
@@ -1,10 +1,30 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl pup common-updater-scripts
+#!nix-shell -i bash -p curl pup
 
 set -eu -o pipefail
 
-version="$(curl -Ls https://zoom.us/download\?os\=linux | \
-  pup '.linux-ver-text text{}' | \
-  awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
+dirname="$(dirname "$0")"
 
-update-source-version zoom-us "$version"
+uname="$(uname)"
+
+if [[ "$uname" == "Linux" ]]; then
+    version="$(curl -Ls https://zoom.us/download\?os\=linux | \
+      pup '.linux-ver-text text{}' | \
+      awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
+    printf '"%s"\n' ${version} > $dirname/x86_64-linux-version.nix
+    printf '"%s"\n' \
+        $(nix-prefetch-url https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz) > \
+        $dirname/x86_64-linux-sha.nix
+elif [[ $uname == "Darwin" ]]; then
+    # The 1st line might be empty
+    # 2nd line is the version of the conference room application
+    version="$(curl -Ls https://zoom.us/download\?os\=mac | \
+      pup '.ver text{}' | \
+      sed '/^$/d' |\
+      head -1 | \
+      awk -F'[ ().]' '{printf $2"."$3"."$4"."$6"\n"}')"
+    printf '"%s"\n' ${version} > "$dirname/$(uname -m)-darwin-version.nix"
+    printf '"%s"\n' \
+        $(nix-prefetch-url "https://zoom.us/client/${version}/Zoom.pkg?archType=$(uname -m)") > \
+        "$dirname/$(uname -m)-darwin-sha.nix"
+fi
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix
new file mode 100644
index 000000000000..a5ef33d28b56
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-sha.nix
@@ -0,0 +1 @@
+"12s4z80n1qk1vcp5vppabj6fxanm4q7pjj7mggalmjbj6984fsza"
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix
new file mode 100644
index 000000000000..4fd4c471b3cf
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-darwin-version.nix
@@ -0,0 +1 @@
+"5.11.1.8356"
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix
new file mode 100644
index 000000000000..c50424c7a5b0
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix
@@ -0,0 +1 @@
+"1ir5akl4vrzb0b5s37s2viqisvf4sylw8rfnfj434h1q0gqz79sc"
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix
new file mode 100644
index 000000000000..e776017ccb04
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix
@@ -0,0 +1 @@
+"5.11.1.3595"