diff --git a/Dockerfile b/Dockerfile index 01bc63b..e6fb20b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,55 +1,15 @@ -FROM alpine:3.21 +FROM alpine:edge # Install build dependencies # TODO: trim dependencies? RUN apk update && apk add \ - build-base abuild \ - rustup \ build-base \ + abuild \ + rustup \ musl-dev \ - gcc \ - cmake \ - make \ pkgconfig \ - perl \ - python3 \ - curl \ - git \ - llvm \ - clang \ - clang-libclang \ protobuf-dev \ - libc-dev \ - linux-headers \ - freetype-dev \ - freetype-static \ - fontconfig-dev \ - fontconfig-static \ - bzip2-dev \ - bzip2-static \ - brotli-dev \ - brotli-static \ - expat-dev \ - expat-static \ - libx11-dev \ - libxcursor-dev \ - libxkbcommon-dev \ - libxkbcommon-static \ - wayland-dev \ - wayland-libs-client \ - wayland-libs-server \ - wayland-static \ - openssl-dev \ - openssl-libs-static \ - zlib-dev \ - zlib-static \ - libpng-dev \ - libpng-static \ - libwebp-dev \ - libwebp-static \ - tiff-dev \ - libjpeg-turbo-dev \ - libjpeg-turbo-static + fontconfig-dev RUN rustup-init -y --default-toolchain stable diff --git a/mullvad-vpn-slint/APKBUILD b/mullvad-vpn-slint/APKBUILD index 33500f3..a10dd67 100644 --- a/mullvad-vpn-slint/APKBUILD +++ b/mullvad-vpn-slint/APKBUILD @@ -9,54 +9,14 @@ arch="$(uname -m)" license="GPL-3-or-later" # TODO: maybe depend on mullvad-vpn-daemon? depends=" - freetype-dev - freetype-static - fontconfig-dev - fontconfig-static - bzip2-dev - bzip2-static - brotli-dev - brotli-static - expat-dev - expat-static - libx11-dev - libxcursor-dev - libxkbcommon-dev - libxkbcommon-static - wayland-dev - wayland-libs-client - wayland-libs-server - wayland-static - openssl-dev - openssl-libs-static - zlib-dev - zlib-static - libpng-dev - libpng-static - libwebp-dev - libwebp-static - tiff-dev - libjpeg-turbo-dev - libjpeg-turbo-static " makedepends=" - rustup build-base + rustup musl-dev - gcc - cmake - make pkgconfig - perl - python3 - curl - git - llvm - clang - clang-libclang protobuf-dev - libc-dev - linux-headers + fontconfig-dev " checkdepends="" install=""