fixups

Author: jcscottiii

Makefile

@@ -39,11 +39,17 @@ DOCKERFILES := \
 
 build: gen go-build node-install
 
+# Note: We only install deps for webkit because full --with-deps fails on newer systems
+# (like Ubuntu 24.04) due to virtual package resolution issues (e.g. libasound2).
 nix-setup: node-install go-install-tools gen
 	npx playwright install
+	npx playwright install-deps webkit
 
 clean: clean-gen clean-node port-forward-terminate minikube-delete
 
+clean-nix:
+	rm -rf .nix/
+
 precommit: license-check  go-fix go-tidy lint test unstaged-changes
 
 ################################
@@ -392,7 +398,7 @@ playwright-install:
 	@if [ -z "$$PLAYWRIGHT_BROWSERS_PATH" ]; then \
 		npx playwright install --with-deps; \
 	else \
-		echo "Skipping playwright install because PLAYWRIGHT_BROWSERS_PATH is set to $$PLAYWRIGHT_BROWSERS_PATH"; \
+		echo "Skipping playwright install because PLAYWRIGHT_BROWSERS_PATH is set to $$PLAYWRIGHT_BROWSERS_PATH. This should have been handled by nix-develop already to prevent sudo prompt."; \
 	fi
 
 playwright-update-snapshots: fresh-env-for-playwright

README.md

@@ -60,6 +60,9 @@ nix develop
 make nix-setup
 ```
 
+> [!NOTE]
+> To clean up the downloaded browsers and start fresh, you can run `make clean-nix`.
+
 ### Running the services locally
 
 After setting up your environment, check out the [DEVELOPMENT.md](./DEVELOPMENT.md) for more information to get started and running locally.

docs/nix-setup.md

@@ -24,9 +24,9 @@ make nix-setup
 
 This will drop you into a new shell with all the required tools in your `PATH`:
 
-- Go (1.26.1)
-- Node.js (24.14.0)
-- OpenJDK 25
+- Go
+- Node.js
+- OpenJDK
 - Terraform, Cloud SDK, Minikube, Skaffold, etc.
 
 You can verify the versions by looking at the output message when you enter the shell.
@@ -101,32 +101,15 @@ Instead, rely entirely on your host shell's `direnv` hook:
 
 Now, whenever you open a new integrated terminal in VS Code, your shell will automatically load the Nix environment _after_ initialization, ensuring all tools are available.
 
-## Playwright WebKit on Nix
-
-Playwright's WebKit browser requires some special handling in a Nix environment because it expects libraries that may not match the default versions in Nixpkgs.
-
-We have handled this in `flake.nix`:
+## Playwright and Browsers
 
-1.  **Correct Library Versions**: We use `libxml2_13` instead of the default `libxml2` because it provides the exact `libxml2.so.2` file WebKit expects, avoiding brittle symlink hacks.
-2.  **Automatic Patching**: When you enter the shell (`nix develop`), it automatically checks if Playwright browsers are installed in `.nix/browsers`. If found, it patches the `MiniBrowser` wrapper script to preserve your `LD_LIBRARY_PATH` instead of overwriting it.
+Playwright manages its own browser binaries and system dependencies.
 
-### Clean Build of the Environment
+When you run `make nix-setup`, it runs `npx playwright install` to download browsers, and `npx playwright install-deps webkit` to install system dependencies for WebKit on the host.
 
-If you run into issues with browsers or want to ensure a clean setup:
+We only install dependencies for `webkit` because a full `--with-deps` can fail on newer Linux distributions (like Ubuntu 24.04) due to package name changes (e.g., `libasound2` being replaced by `libasound2t64`).
 
-1.  **Clean Playwright Cache**: Delete the cached browsers to force a redownload.
-    ```bash
-    rm -rf .nix/browsers
-    ```
-2.  **Re-install Browsers**: Run the install command again (inside `nix develop`).
-    ```bash
-    npx playwright install
-    ```
-3.  **Re-enter Shell**: Exit and re-enter `nix develop` to trigger the automatic patching again!
-    ```bash
-    exit
-    nix develop
-    ```
+This ensures that browsers work correctly without needing complex configuration or patching in the Nix flake.
 
 ## Playwright E2E Tests and Docker
 

flake.nix

@@ -38,43 +38,7 @@
             netcat
             antlr4
 
-            # Libraries needed for Playwright browsers (added for WebKit, might help others)
-            mesa
-            libGL
-            libxkbcommon
-            wayland
-            enchant_2
-            libsecret
-            libgudev
-            gst_all_1.gstreamer
-            gst_all_1.gst-plugins-base
-            gst_all_1.gst-plugins-good
-            atk
-            at-spi2-atk
-            at-spi2-core
-            cups
-            dbus
-            glib
-            gtk3
-            pango
-            cairo
-            expat
-            libdrm
-            fontconfig
-            freetype
-            libx11
-            libxcomposite
-            libxdamage
-            libxext
-            libxfixes
-            libxrandr
-            libxcb
-            libxshmfence
-            libxtst
-            libxi
-            libxcursor
-            libxml2_13
-            libevent
+
           ];
 
           shellHook = ''
@@ -83,24 +47,9 @@
             export DOCKER_BUILDKIT=1
             export ANTLR=antlr4
             export USE_DOCKER_BROWSER=true
-            export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libxml2_13.out}/lib:${pkgs.libevent.out}/lib"
-            
             # Isolate Playwright browsers to this project
             export PLAYWRIGHT_BROWSERS_PATH="$PWD/.nix/browsers"
             
-            # Automate patching Playwright WebKit for Nix
-            WEBKIT_DIR=$(find "$PLAYWRIGHT_BROWSERS_PATH" -name "webkit-*" -type d 2>/dev/null | head -n 1)
-            if [ -n "$WEBKIT_DIR" ]; then
-              find "$WEBKIT_DIR" -name "MiniBrowser" -type f | while read -r wrapper; do
-                if [ -f "$wrapper" ]; then
-                  if ! grep -q '\$LD_LIBRARY_PATH' "$wrapper"; then
-                    echo "Patching Playwright WebKit wrapper $wrapper to preserve LD_LIBRARY_PATH..."
-                    sed -i 's|export LD_LIBRARY_PATH="''${MYDIR}/lib:''${MYDIR}/sys/lib"|export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:''${MYDIR}/lib:''${MYDIR}/sys/lib"|' "$wrapper"
-                  fi
-                fi
-              done
-            fi
-            
             echo "Entering Nix environment for webstatus.dev"
             
             # Print versions