From 1ac8162c30811f75d0ca22ce1c27f2401e27755e Mon Sep 17 00:00:00 2001 From: AramJonghu Date: Mon, 29 Jun 2026 00:45:47 +0200 Subject: [PATCH] adjusted CMake file to not require Cava --- Plugins/ZShell/CMakeLists.txt | 2 +- ci/Dockerfile | 39 +++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Plugins/ZShell/CMakeLists.txt b/Plugins/ZShell/CMakeLists.txt index 2457613..32c4675 100644 --- a/Plugins/ZShell/CMakeLists.txt +++ b/Plugins/ZShell/CMakeLists.txt @@ -9,7 +9,7 @@ pkg_check_modules(Cava IMPORTED_TARGET libcava QUIET) pkg_check_modules(GLIB REQUIRED glib-2.0 gobject-2.0 gio-2.0) if(NOT Cava_FOUND) - pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED) + pkg_check_modules(Cava IMPORTED_TARGET cava QUIET) endif() if(NOT TARGET Sensors::Sensors) diff --git a/ci/Dockerfile b/ci/Dockerfile index 4b1e99d..0e49d21 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,30 +1,29 @@ -FROM alpine:edge +FROM archlinux:latest + +RUN pacman -Syu --noconfirm # Build toolchain -RUN apk add --no-cache \ - alpine-sdk \ +RUN pacman -S --noconfirm \ + base-devel \ cmake \ ninja \ - clang22 \ - clang22-extra-tools \ - clang22-dev \ - llvm22-dev \ - llvm-dev \ + clang \ lld \ - pkgconf \ + nodejs \ git # Qt6 -RUN apk add --no-cache \ - qt6-qtbase-dev \ - qt6-qtdeclarative-dev \ - qt6-qtshadertools-dev \ - qt6-qt5compat-dev +RUN pacman -S --noconfirm \ + qt6-base \ + qt6-declarative \ + qt6-shadertools \ + qt6-5compat \ + qt6-canvaspainter # Project-specific dependencies -RUN apk add --no-cache \ - libqalculate-dev \ - pipewire-dev \ - aubio-dev \ - lm-sensors-dev \ - glib-dev +RUN pacman -S --noconfirm \ + libqalculate \ + pipewire \ + aubio \ + lm_sensors \ + glib2