diff --git a/contrib/containers/guix/scripts/guix-start b/contrib/containers/guix/scripts/guix-start index ee0be9d28550..42300bc453b6 100755 --- a/contrib/containers/guix/scripts/guix-start +++ b/contrib/containers/guix/scripts/guix-start @@ -11,7 +11,7 @@ fi if [[ -z "${HOSTS}" || "${HOSTS}" == *"darwin"* ]]; then export SDK_PATH="${SDK_PATH:-${WORKSPACE_PATH}/depends/SDKs}" - export SDK_SRCS="${SDK_PATH:-${WORKSPACE_PATH}/depends/sdk-sources}" + export SDK_SOURCES="${SDK_SOURCES:-${WORKSPACE_PATH}/depends/sdk-sources}" ./contrib/containers/guix/scripts/setup-sdk fi diff --git a/contrib/containers/guix/scripts/setup-sdk b/contrib/containers/guix/scripts/setup-sdk index 4550aeed6424..9781ce07285d 100755 --- a/contrib/containers/guix/scripts/setup-sdk +++ b/contrib/containers/guix/scripts/setup-sdk @@ -9,16 +9,16 @@ set -eo pipefail SDK_URL="${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}" SDK_PATH="${SDK_PATH:-depends/SDKs}" -SDK_SRCS="${SDK_SOURCES:-depends/sdk-sources}" +SDK_SOURCES="${SDK_SOURCES:-depends/sdk-sources}" XCODE_VERSION="${XCODE_VERSION:-15.0}" XCODE_RELEASE="${XCODE_RELEASE:-15A240d}" XCODE_ARCHIVE="Xcode-${XCODE_VERSION}-${XCODE_RELEASE}-extracted-SDK-with-libcxx-headers" -XCODE_AR_PATH="${SDK_SRCS}/${XCODE_ARCHIVE}.tar.gz" +XCODE_AR_PATH="${SDK_SOURCES}/${XCODE_ARCHIVE}.tar.gz" if [ ! -d "${SDK_PATH}/${XCODE_ARCHIVE}" ]; then if [ ! -f "${XCODE_AR_PATH}" ]; then echo "Downloading macOS SDK..." - mkdir -p "${SDK_SRCS}" + mkdir -p "${SDK_SOURCES}" curl --location --fail "${SDK_URL}/${XCODE_ARCHIVE}.tar.gz" -o "${XCODE_AR_PATH}" fi echo "Extracting macOS SDK..."