diff --git a/README.md b/README.md index 2717cc6..b767658 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,21 @@ Vieter requires several tools to be developed, one of which being a specific version of Vlang. This repository manages Dockerfiles & other packages for these various tools. -## Build instructions +## Vlang -Most stuff in this repository is built automatically using my CI. These -instructions can be found in [`.woodpecker`](./.woodpecker). +### Arch package -### Vlang Docker image +The compiler is provided as an Arch package for both `x86_64` and `aarch64`. +This can be installed by adding the repo below to your `pacman.conf` and +installing the `vieter-vlang` package. + +```toml +[vieter] +Server = https://arch.r8r.be/$repo/$arch +SigLevel = Optional +``` + +### Docker image The Vlang Docker image takes too long to build on my CI, mostly because it needs to be built for both arm64 & aarch64. It can be built by running the @@ -18,9 +27,11 @@ following command in the `vlang` directory: ```sh docker buildx build \ --platform linux/amd64,linux/arm64 \ - -t 'git.rustybever.be/vieter/vlang:5d4c9dc9fc11bf8648541c934adb64f27cb94e37-alpine3.17' \ - -t 'git.rustybever.be/vieter/vlang:latest' \ + -t 'git.rustybever.be/vieter-v/vlang:5d4c9dc9fc11bf8648541c934adb64f27cb94e37-alpine3.17' \ + -t 'git.rustybever.be/vieter-v/vlang:latest' \ --push . ``` +This build requires a working buildx environment. + The hash in the tag corresponds to the tag of the vlang repository. diff --git a/vlang/.SRCINFO b/vlang/.SRCINFO index c27f0ab..239b76c 100644 --- a/vlang/.SRCINFO +++ b/vlang/.SRCINFO @@ -9,6 +9,7 @@ pkgbase = vieter-vlang license = MIT makedepends = git depends = glibc + depends = libx11 optdepends = glfw: Needed for graphics support optdepends = freetype2: Needed for graphics support optdepends = openssl: Needed for http support diff --git a/vlang/PKGBUILD b/vlang/PKGBUILD index 2cb35cb..baead95 100644 --- a/vlang/PKGBUILD +++ b/vlang/PKGBUILD @@ -14,7 +14,7 @@ pkgdesc='Locked Vlang version used to develop Vieter' arch=('x86_64' 'aarch64') url='https://vlang.io' license=('MIT') -depends=('glibc') +depends=('glibc' 'libx11') optdepends=('glfw: Needed for graphics support' 'freetype2: Needed for graphics support' 'openssl: Needed for http support')