From 2b52de2118fced437f54f2f2b67e4cb46b9b441a Mon Sep 17 00:00:00 2001 From: Tim Clancy Date: Thu, 20 Nov 2025 17:38:26 -0500 Subject: [PATCH] feat: added requirements for multi-image building --- Dockerfile | 5 ++++- flake.nix | 5 +++-- nix.conf | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d85dad3fa..14a71cef8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -186,12 +186,15 @@ ENV RUSTUP_HOME=/home/petros/.rustup ENV CARGO_HOME=/home/petros/.cargo ENV PATH=/home/petros/.sp1-shims/bin:/home/petros/.cargo/bin:\ /petros/bin:$PATH +ENV PKG_CONFIG_PATH=/petros/lib/pkgconfig +ENV CC=clang +ENV LIBCLANG_PATH=/petros/lib USER 10001:10001 # Test that all expected binaries are working. COPY src/scripts/test.sh /home/petros/test.sh RUN sh /home/petros/test.sh bash ls cat echo openssl curl jq gpg \ - pkg-config rustc cargo node docker doctl cosign make file && \ + pkg-config rustc cargo node docker doctl cosign crane make file protoc go clang && \ rm /home/petros/test.sh RUN which cargo-prove RUN cargo prove --version diff --git a/flake.nix b/flake.nix index 3078445e0..d002fae14 100644 --- a/flake.nix +++ b/flake.nix @@ -97,14 +97,15 @@ name = "petros-env"; paths = with pkgs; [ bash coreutils git cacert curl jq gnumake file - clang lld pkg-config - openssl zlib lz4 snappy zstd + clang lld llvmPackages.libclang.lib pkg-config protobuf go + openssl openssl.dev zlib zlib.dev lz4 lz4.dev snappy zstd zstd.dev attic-client attic-server nodejs docker-client doctl cosign + crane # Vendored Rust 1.89.0 toolchain. rust_1_89.packages.stable.rustc diff --git a/nix.conf b/nix.conf index b1079e6d7..7cfaf4abe 100644 --- a/nix.conf +++ b/nix.conf @@ -3,7 +3,7 @@ sandbox = true require-sigs = true accept-flake-config = false connect-timeout = 10 -stalled-download-timeout = 60 +stalled-download-timeout = 300 download-attempts = 5 max-jobs = auto cores = 0