From 0c816328ae81637f36051e2da3733e24d389f41f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 10 May 2026 10:44:20 +0300
Subject: [PATCH] zoom-us: remove mesa dependency and questionable test

The NixOS test covers the same use case, but has a correctly set up,
actually-graphical environment without the limitations of xvfb-run.
---
 nixos/tests/zoom-us.nix             |  2 ++
 pkgs/by-name/zo/zoom-us/package.nix |  2 --
 pkgs/by-name/zo/zoom-us/test.nix    | 44 -----------------------------
 3 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/by-name/zo/zoom-us/test.nix

diff --git a/nixos/tests/zoom-us.nix b/nixos/tests/zoom-us.nix
index bc9961cf5a86..a8a6a3f2f9ea 100644
--- a/nixos/tests/zoom-us.nix
+++ b/nixos/tests/zoom-us.nix
@@ -14,5 +14,7 @@
     machine.wait_for_x()
     machine.execute("zoom >&2 &")
     machine.wait_for_window("Zoom Workplace")
+    machine.sleep(20)
+    machine.wait_for_window("Zoom Workplace")
   '';
 }
diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index d811819729b7..916792aec826 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -135,7 +135,6 @@ let
     dontPatchELF = true;
 
     passthru.updateScript = ./update.sh;
-    passthru.tests.startwindow = callPackage ./test.nix { };
     passthru.tests.nixos-module = nixosTests.zoom-us;
 
     meta = {
@@ -179,7 +178,6 @@ let
       pkgs.libxi
       pkgs.libxkbcommon
       pkgs.libxslt
-      pkgs.mesa
       pkgs.mesa-demos
       pkgs.nspr
       pkgs.nss
diff --git a/pkgs/by-name/zo/zoom-us/test.nix b/pkgs/by-name/zo/zoom-us/test.nix
deleted file mode 100644
index 57cc2047312f..000000000000
--- a/pkgs/by-name/zo/zoom-us/test.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  xvfb-run,
-  zoom-us,
-  runCommand,
-  writeShellApplication,
-  xwininfo,
-}:
-
-let
-  testScript = writeShellApplication {
-    name = "zoom-us-test-script";
-    runtimeInputs = [
-      xwininfo
-      zoom-us
-    ];
-    text = ''
-      function is_zoom_window_present {
-        echo
-        xwininfo -root -tree  \
-            | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'  \
-            | tee window-names
-        grep -q "Zoom Workplace" window-names
-      }
-      # Don't let zoom eat all RAM, like it did, cf.
-      # https://github.com/NixOS/nixpkgs/issues/371488
-      prlimit --{as,data}=$((4*2**30)):$((4*2**30)) zoom-us &
-      for _ in {0..900} ; do
-        if is_zoom_window_present ; then
-          break
-        fi
-        sleep 1
-      done
-      # If libraries are missing, the window still appears,
-      # but then disappears again immediately; check for that also.
-      sleep 20
-      is_zoom_window_present
-    '';
-  };
-in
-runCommand "zoom-us-test" { buildInputs = [ xvfb-run ]; } ''
-  HOME=$PWD xvfb-run ${lib.getExe testScript}
-  touch ${placeholder "out"}
-''