From f66e440fa31196cc783a304ad53618e931e18d9a Mon Sep 17 00:00:00 2001
From: Chance <Caznix01@gmail.com>
Date: Thu, 10 Apr 2025 17:02:41 -0400
Subject: [PATCH] fix: pkg-config cannot cross compile to different
 architectures

---
 .forgejo/workflows/rust.yml | 112 ++++++++++++++----------------------
 1 file changed, 43 insertions(+), 69 deletions(-)

diff --git a/.forgejo/workflows/rust.yml b/.forgejo/workflows/rust.yml
index 4c58d21..9660e9a 100644
--- a/.forgejo/workflows/rust.yml
+++ b/.forgejo/workflows/rust.yml
@@ -14,98 +14,72 @@ jobs:
           - x86_64-unknown-linux-gnu
           - aarch64-unknown-linux-gnu
           - x86_64-pc-windows-gnu
-          - x86_64-apple-darwin
-          - aarch64-apple-darwin
+          - xarch64-apple-darwin
         include:
-          # Linux targets
           - target: x86_64-unknown-linux-gnu
             binary_name: zenyx-x86_64-linux
-            source_binary: zenyx
             deps: libwayland-dev wayland-protocols
-            linker_env_var: ""
-            linker_env_value: ""
-            cargo_command: build
+            pkg_config: ""
+            triple: x86_64-linux-gnu
+          
           - target: aarch64-unknown-linux-gnu
             binary_name: zenyx-aarch64-linux
-            source_binary: zenyx
-            deps: gcc-aarch64-linux-gnu g++-aarch64-linux-gnu qemu-user libwayland-dev wayland-protocols
-            linker_env_var: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER
-            linker_env_value: aarch64-linux-gnu-gcc
-            cargo_command: build
-          # Windows target
+            deps: gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libwayland-dev:arm64 wayland-protocols
+            pkg_config: aarch64-linux-gnu-pkg-config
+            triple: aarch64-linux-gnu
+          
           - target: x86_64-pc-windows-gnu
             binary_name: zenyx-x86_64-windows.exe
-            source_binary: zenyx.exe
             deps: mingw-w64
-            linker_env_var: CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER
-            linker_env_value: x86_64-w64-mingw32-gcc
-            cargo_command: build
-          # macOS targets
-          - target: x86_64-apple-darwin
-            binary_name: zenyx-x86_64-macos
-            source_binary: zenyx
-            deps: 
-            linker_env_var: CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER
-            linker_env_value: zig
-            cargo_command: zigbuild
-          - target: aarch64-apple-darwin
-            binary_name: zenyx-aarch64-macos
-            source_binary: zenyx
-            deps: 
-            linker_env_var: CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER
-            linker_env_value: zig
-            cargo_command: zigbuild
+            pkg_config: x86_64-w64-mingw32-pkg-config
+            triple: x86_64-w64-mingw32
+
     runs-on: ubuntu-latest
     steps:
       - name: 📥 Clone repository
         uses: actions/checkout@v4
-      
-      - name: 🐧 Install Linux dependencies
-        if: contains(matrix.target, 'linux')
+
+      - name: 🛠️ Install dependencies
         run: |
-          apt-get update
-          apt-get install -y ${{ matrix.deps }}
-      
-      - name: 🪟 Install Windows dependencies
-        if: contains(matrix.target, 'windows')
+          sudo apt-get update
+          sudo apt-get install -y \
+            ${{ matrix.deps }} \
+            pkg-config \
+            ${{ matrix.pkg_config }}
+
+      - name: 🔧 Setup pkg-config
+        if: matrix.pkg_config != ''
         run: |
-          apt-get update
-          apt-get install -y ${{ matrix.deps }}
-      
-      - name: 🍎 Install macOS dependencies (Zig)
-        if: contains(matrix.target, 'apple-darwin')
-        run: |
-          wget https://ziglang.org/builds/zig-linux-x86_64-0.11.0.tar.xz
-          tar xf zig-linux-x86_64-0.11.0.tar.xz
-          echo "$(pwd)/zig-linux-x86_64-0.11.0" >> $GITHUB_PATH
-      
-      - name: 🔧 Install Rust
-        uses: https://github.com/actions-rs/toolchain@v1
+          echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=/usr/lib/${{ matrix.triple }}/pkgconfig" >> $GITHUB_ENV
+          echo "PKG_CONFIG_SYSROOT_DIR=/usr/${{ matrix.triple }}" >> $GITHUB_ENV
+
+      - name: 🦀 Install Rust target
+        uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
-          override: true
           target: ${{ matrix.target }}
-          profile: minimal
-      
-      - name: 🔧 Install cargo-zigbuild
-        if: contains(matrix.target, 'apple-darwin')
-        run: cargo install cargo-zigbuild
-      
+          override: true
+
       - name: 🏗️ Build
-        run: cargo ${{ matrix.cargo_command }} --release --target ${{ matrix.target }}
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release --target ${{ matrix.target }}
         env:
-          ${{ matrix.linker_env_var }}: ${{ matrix.linker_env_value }}
-          CARGO_TERM_COLOR: always
-      
-      - name: 📦 Prepare binary
+          CARGO_TARGET_${{ matrix.target }}_LINKER: ${{ matrix.triple }}-gcc
+          PKG_CONFIG_ALLOW_CROSS: 1
+          PKG_CONFIG_PATH: /usr/lib/${{ matrix.triple }}/pkgconfig
+          PKG_CONFIG_SYSROOT_DIR: /usr/${{ matrix.triple }}
+
+      - name: 📦 Package artifact
         run: |
           mkdir -p artifacts
-          cp target/${{ matrix.target }}/release/${{ matrix.source_binary }} artifacts/${{ matrix.binary_name }}
+          cp target/${{ matrix.target }}/release/zenyx* artifacts/${{ matrix.binary_name }}
           chmod +x artifacts/${{ matrix.binary_name }}
-      
-      - name: Upload artifacts
+
+      - name: ⬆️ Upload artifact
         uses: https://code.forgejo.org/forgejo/upload-artifact@v4
         with:
           name: ${{ matrix.binary_name }}
-          path: artifacts/${{ matrix.binary_name }}
-          compression-level: 9
\ No newline at end of file
+          path: artifacts/${{ matrix.binary_name }}
\ No newline at end of file