Devcontainer: Install rust via devcontainer feature
This commit is contained in:
parent
3ea71b19ab
commit
44503ddd82
4 changed files with 6 additions and 6 deletions
|
|
@ -5,6 +5,9 @@
|
||||||
"features": {
|
"features": {
|
||||||
"ghcr.io/devcontainers/features/github-cli:1": {},
|
"ghcr.io/devcontainers/features/github-cli:1": {},
|
||||||
"ghcr.io/devcontainers-extra/features/pre-commit:2": {},
|
"ghcr.io/devcontainers-extra/features/pre-commit:2": {},
|
||||||
|
"ghcr.io/devcontainers/features/rust:1": {
|
||||||
|
"profile": "default"
|
||||||
|
},
|
||||||
"./features/ladybird": {
|
"./features/ladybird": {
|
||||||
"llvm_version": 20
|
"llvm_version": 20
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,3 @@ dnf install -y git gh
|
||||||
dnf install -y autoconf-archive automake bison ccache cmake curl google-noto-sans-mono-fonts liberation-sans-fonts \
|
dnf install -y autoconf-archive automake bison ccache cmake curl google-noto-sans-mono-fonts liberation-sans-fonts \
|
||||||
libglvnd-devel libtool nasm ninja-build patchelf perl-FindBin perl-IPC-Cmd perl-lib qt6-qtbase-devel \
|
libglvnd-devel libtool nasm ninja-build patchelf perl-FindBin perl-IPC-Cmd perl-lib qt6-qtbase-devel \
|
||||||
qt6-qttools-devel qt6-qtwayland-devel tar unzip zip zlib-ng-compat-static
|
qt6-qttools-devel qt6-qtwayland-devel tar unzip zip zlib-ng-compat-static
|
||||||
|
|
||||||
# Install Rust toolchain
|
|
||||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,6 @@ install_llvm_key() {
|
||||||
apt update -y
|
apt update -y
|
||||||
apt install -y lsb-release git python3 autoconf autoconf-archive automake bison build-essential cmake libdrm-dev libgl1-mesa-dev libtool libxkbcommon-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-wayland ccache fonts-liberation2 zip unzip curl tar
|
apt install -y lsb-release git python3 autoconf autoconf-archive automake bison build-essential cmake libdrm-dev libgl1-mesa-dev libtool libxkbcommon-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-wayland ccache fonts-liberation2 zip unzip curl tar
|
||||||
|
|
||||||
### Install Rust toolchain
|
|
||||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
|
||||||
|
|
||||||
### Ensure new enough host compiler is available
|
### Ensure new enough host compiler is available
|
||||||
|
|
||||||
VERSION="0.0.0"
|
VERSION="0.0.0"
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,9 @@
|
||||||
// Features to add to the dev container. More info: https://containers.dev/features.
|
// Features to add to the dev container. More info: https://containers.dev/features.
|
||||||
"features": {
|
"features": {
|
||||||
"ghcr.io/devcontainers/features/common-utils:2": {},
|
"ghcr.io/devcontainers/features/common-utils:2": {},
|
||||||
|
"ghcr.io/devcontainers/features/rust:1": {
|
||||||
|
"profile": "default"
|
||||||
|
},
|
||||||
"../features/ladybird" : {
|
"../features/ladybird" : {
|
||||||
"distro": "fedora"
|
"distro": "fedora"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue