From a1e4f47300cd197758f918096c4aaa753eb7dd0b Mon Sep 17 00:00:00 2001
From: Mike Solar <iam@mikesolar.cn>
Date: Fri, 21 Aug 2026 00:12:55 +0800
Subject: [PATCH] ci: GNU-target Rust on Windows, pipewire dev packages on
 Linux

- Windows: install MSYS2's own Rust (x86_64-pc-windows-gnu host); the
  rustup MSVC toolchain is not on the msys2 shell's PATH and the MSVC
  linker rejects the Unix-style link args the build scripts emit
- Linux: libpipewire-0.3-dev + libspa-0.2-dev for libspa-sys (gpui's
  Linux screen-capture/audio stack)
---
 .github/workflows/cd.yml | 5 +++++
 .github/workflows/ci.yml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index a0e4ce225..487844b6c 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -39,6 +39,7 @@ jobs:
           # Oak_Icon.svg).
           sudo apt-get install -y \
             cmake \
+            libpipewire-0.3-dev libspa-0.2-dev \
             librsvg2-bin \
             libgl1-mesa-dev libgl1-mesa-dri mesa-vulkan-drivers \
             libvulkan-dev libxkbcommon-dev
@@ -221,9 +222,13 @@ jobs:
         with:
           msystem: UCRT64
           update: true
+          # MSYS2's own Rust targets x86_64-pc-windows-gnu by default —
+          # the Windows build is GNU-target (the MSVC linker rejects the
+          # Unix-style link args the build scripts emit).
           install: >-
             git
             mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-rust
 
       - name: Install system dependencies
         run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4732b4ad5..c7fa7b10d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,6 +53,7 @@ jobs:
           # X11, software Mesa Vulkan (lavapipe) and xvfb.
           sudo apt-get install -y \
             cmake \
+            libpipewire-0.3-dev libspa-0.2-dev \
             libgl1-mesa-dev libgl1-mesa-dri mesa-vulkan-drivers \
             libvulkan-dev libxkbcommon-dev xvfb
 
@@ -68,9 +69,13 @@ jobs:
         with:
           msystem: UCRT64
           update: true
+          # MSYS2's own Rust targets x86_64-pc-windows-gnu by default —
+          # the Windows build is GNU-target (the MSVC linker rejects the
+          # Unix-style link args the build scripts emit).
           install: >-
             git
             mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-rust
 
       - name: Install system dependencies (Windows)
         if: runner.os == 'Windows'