diff --git a/images/wkdev_sdk/Containerfile b/images/wkdev_sdk/Containerfile index cbbd8ac..166d066 100644 --- a/images/wkdev_sdk/Containerfile +++ b/images/wkdev_sdk/Containerfile @@ -80,6 +80,19 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.s rm -rf WebKit && \ ${APT_AUTOREMOVE} +# Add Rust environment. +ENV RUSTUP_HOME="/opt/rust" \ + CARGO_HOME="/opt/rust" \ + PATH="/root/.cargo/bin:${PATH}" + +# Install any necessary rust projects +# The Ubuntu provided sccache 0.7.7 package is broken +# Building GStreamer needs cargo-c +RUN rustup toolchain install 1.78 && \ + cargo install --root /usr/local --version 0.8.1 --locked sccache && \ + cargo install --root /usr/local cargo-c && \ + rm -rf ~/.cargo + # Copy jhbuild helper files and do the initial build & install COPY /jhbuild/jhbuildrc /etc/xdg/jhbuildrc COPY /jhbuild/webkit-sdk-deps.modules /jhbuild/webkit-sdk-deps.modules @@ -127,8 +140,5 @@ RUN export QT_VERSION=$(qmake6 -query QT_VERSION) && \ ln -s ${directory} ${directory}/${QT_VERSION} >/dev/null 2>&1 || true; \ done -# Build custom sccache version (the Ubuntu provided 0.7.7 package is broken) -RUN cargo install --root /usr/local --version 0.8.1 --locked sccache - # Switch back to interactive prompt, when using apt. ENV DEBIAN_FRONTEND dialog diff --git a/images/wkdev_sdk/required_system_packages/04-devtools.lst b/images/wkdev_sdk/required_system_packages/04-devtools.lst index 61ce003..319ae80 100644 --- a/images/wkdev_sdk/required_system_packages/04-devtools.lst +++ b/images/wkdev_sdk/required_system_packages/04-devtools.lst @@ -2,7 +2,7 @@ build-essential cmake ninja-build # Build tools -icecc ccache cargo +icecc ccache rustup # Debugging / profiling / tracing valgrind rr perf-tools-unstable systemd-coredump