Fix merge conflict

This commit is contained in:
2026-09-04 07:52:50 +02:00
parent d31b44b2a5
commit 74af43e4f8
+3 -3
View File
@@ -31,14 +31,14 @@ RUN VERSION=1.3.0; \
RUN pipx install conan \
&& pipx install gcovr
# Install Vulkan SDK 1.4.341.0
RUN wget -q https://sdk.lunarg.com/sdk/download/1.4.341.0/linux/vulkansdk-linux-x86_64-1.4.341.0.tar.xz \
# Install Vulkan SDK 1.4.350.0
RUN wget -q https://sdk.lunarg.com/sdk/download/1.4.350.0/linux/vulkansdk-linux-x86_64-1.4.350.0.tar.xz \
-O /tmp/vulkansdk.tar.xz \
&& mkdir -p /opt/vulkan \
&& tar -xf /tmp/vulkansdk.tar.xz -C /opt/vulkan \
&& rm /tmp/vulkansdk.tar.xz
ENV VULKAN_SDK=/opt/vulkan/1.4.341.0/x86_64
ENV VULKAN_SDK=/opt/vulkan/1.4.350.0/x86_64
ENV PATH="${VULKAN_SDK}/bin:${PATH}"
ENV LD_LIBRARY_PATH="${VULKAN_SDK}/lib:${LD_LIBRARY_PATH}"
ENV VK_LAYER_PATH="${VULKAN_SDK}/share/vulkan/explicit_layer.d"