From e1e6581d726b1f84a0feaa1711c83b2d6db7741c Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Thu, 1 Feb 2024 15:49:20 +0100
Subject: [PATCH] a

---
 .github/workflows/build-appimage.yml       | 2 +-
 .github/workflows/build-ubuntu-aarch64.yml | 2 +-
 .github/workflows/build-windows.yml        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-appimage.yml b/.github/workflows/build-appimage.yml
index 0e3fe45d..455c519b 100644
--- a/.github/workflows/build-appimage.yml
+++ b/.github/workflows/build-appimage.yml
@@ -19,7 +19,7 @@ jobs:
       run: |
         sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list
         sudo apt update
-        sudo apt install cmake extra-cmake-modules libpcap0.8-dev libsdl2-dev qt6-{base,base-private,multimedia,tools}-dev qt6-qpa-plugins libslirp0 libslirp-dev libarchive-dev libzstd-dev --allow-downgrades libfuse2
+        sudo apt install cmake extra-cmake-modules libpcap0.8-dev libsdl2-dev qt6-default qt6-{base,base-private,multimedia,tools}-dev qt6-qpa-plugins libslirp0 libslirp-dev libarchive-dev libzstd-dev --allow-downgrades libfuse2
     - name: Create build environment
       run: mkdir ${{runner.workspace}}/build
     - name: Configure
diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml
index b5f2eae9..1dc5e992 100644
--- a/.github/workflows/build-ubuntu-aarch64.yml
+++ b/.github/workflows/build-ubuntu-aarch64.yml
@@ -39,7 +39,7 @@ jobs:
       shell: bash
       run: |
         cmake -B build \
-          -DPKG_CONFIG_EXECUTABLE=aarch64-linux-gnu-pkg-config \
+          -DPKG_CONFIG_EXECUTABLE=/usr/bin/aarch64-linux-gnu-pkg-config \
           -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc-12 \
           -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++-12 \
           -DUSE_QT6=ON
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 7d484399..116b6ed4 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -27,11 +27,11 @@ jobs:
           update: true
 
     - name: Install dependencies
-      run: pacman -Sq --noconfirm git pkgconf mingw-w64-ucrt-x86_64-{cmake,SDL2,qt6-static,libslirp,libarchive,toolchain}
+      run: pacman -Sq --noconfirm git pkgconf mingw-w64-ucrt-x86_64-{cmake,SDL2,qt6-static,libslirp,libarchive,libpng,toolchain}
 
     - name: Configure
       working-directory: ${{runner.workspace}}
-      run: cmake -B build $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DCMAKE_PREFIX_PATH=C:/tools/msys64/mingw64/qt6-static -DUSE_QT6=ON
+      run: cmake -B build $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DUSE_QT6=ON
 
     - name: Make
       working-directory: ${{runner.workspace}}/build