Merge pull request #32 from DeterminateSystems/fix-build-user-prefix-and-base-logic

--nix-build-user-base and --nix-build-user-prefix logic no longer confused
This commit is contained in:
Ana Hobden 2023-07-06 11:13:46 -07:00 committed by GitHub
commit 22b6142a17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -154,13 +154,13 @@ runs:
fi
if [ -n "${{ inputs.nix-build-user-prefix }}" ]; then
export NIX_INSTALLER_NIX_BUILD_USER_ID_BASE=${{ inputs.nix-build-user-prefix }}
echo "Set NIX_INSTALLER_NIX_BUILD_USER_ID_BASE=$NIX_INSTALLER_NIX_BUILD_USER_ID_BASE"
export NIX_INSTALLER_NIX_BUILD_USER_PREFIX=${{ inputs.nix-build-user-prefix }}
echo "Set NIX_INSTALLER_NIX_BUILD_USER_PREFIX=$NIX_INSTALLER_NIX_BUILD_USER_PREFIX"
fi
if [ -n "${{ inputs.nix-build-user-base }}" ]; then
export NIX_INSTALLER_NIX_BUILD_USER_PREFIX=${{ inputs.nix-build-user-base }}
echo "Set NIX_INSTALLER_NIX_BUILD_USER_PREFIX=$NIX_INSTALLER_NIX_BUILD_USER_PREFIX"
export NIX_INSTALLER_NIX_BUILD_USER_BASE=${{ inputs.nix-build-user-base }}
echo "Set NIX_INSTALLER_NIX_BUILD_USER_BASE=$NIX_INSTALLER_NIX_BUILD_USER_BASE"
fi
if [ -n "${{ inputs.nix-package-url }}" ]; then