chore(backport-to-v4-next): fix: some mac install fixes (#20630) (#23486)

Author: nchamo

barretenberg/ts/bootstrap.sh

@@ -68,7 +68,7 @@ function release {
 }
 
 function cross_copy {
-  ./scripts/copy_cross.sh
+  ./scripts/copy_cross.sh "$@"
 }
 
 case "$cmd" in

barretenberg/ts/scripts/copy_cross.sh

@@ -5,7 +5,12 @@ NO_CD=1 source $(git rev-parse --show-toplevel)/ci3/source
 
 cd $(dirname $0)/..
 
-if semver check "${REF_NAME:-}" && [[ "$(arch)" == "amd64" ]]; then
+if [ -n "${1:-}" ]; then
+  arch="$1"
+  mkdir -p ./build/$arch
+  cp ../cpp/build-zig-$arch/bin/bb ./build/$arch
+  cp ../cpp/build-zig-$arch/lib/nodejs_module.node ./build/$arch
+elif semver check "${REF_NAME:-}" && [[ "$(arch)" == "amd64" ]]; then
   # We're building a release.
   # We take host build for amd64-linux.
   mkdir -p ./build/amd64-linux

build-images/src/Dockerfile

@@ -203,6 +203,7 @@ RUN apt update && \
         neovim \
         psmisc \
         python3-blessed \
+        qemu-utils \
         redis-tools \
         rsync \
         software-properties-common \
@@ -264,7 +265,7 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 # It can be used independently:
 # - The user should use the ./run.sh script to launch.
 # - A persistent volume will be mounted to /home/aztec-dev.
-# - It provides docker via the hosts docker instance, mounted at /var/lib/docker.sock.
+# - It provides docker-in-docker.
 # - It uses an entrypoint script at runtime to perform uid/gid alignment with the host and drop into user account.
 FROM basebox AS devbox
 

yarn-project/aztec/scripts/aztec.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-shopt -s inherit_errexit
 
 # Re-execute using correct version if we have an .aztecrc file.
 if [ "${AZTEC_VERSIONED:-0}" -eq 0 ] && [ -f .aztecrc ] && command -v aztec-up &>/dev/null; then