Merge pull request #163 from cachix/fix-nix-2.14
Support new Nix 2.14 profile PATH
This commit is contained in:
commit
29bd9290ef
@ -20,7 +20,7 @@ add_config() {
|
|||||||
# Set jobs to number of cores
|
# Set jobs to number of cores
|
||||||
add_config "max-jobs = auto"
|
add_config "max-jobs = auto"
|
||||||
# Allow binary caches for user
|
# Allow binary caches for user
|
||||||
add_config "trusted-users = root $USER"
|
add_config "trusted-users = root ${USER:-}"
|
||||||
# Add github access token
|
# Add github access token
|
||||||
if [[ -n "${INPUT_GITHUB_ACCESS_TOKEN:-}" ]]; then
|
if [[ -n "${INPUT_GITHUB_ACCESS_TOKEN:-}" ]]; then
|
||||||
add_config "access-tokens = github.com=$INPUT_GITHUB_ACCESS_TOKEN"
|
add_config "access-tokens = github.com=$INPUT_GITHUB_ACCESS_TOKEN"
|
||||||
@ -88,7 +88,8 @@ fi
|
|||||||
|
|
||||||
# Set paths
|
# Set paths
|
||||||
echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
|
echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
|
||||||
echo "/nix/var/nix/profiles/per-user/$USER/profile/bin" >> "$GITHUB_PATH"
|
# new path for nix 2.14
|
||||||
|
echo "$HOME/.nix-profile/bin" >> "$GITHUB_PATH"
|
||||||
|
|
||||||
if [[ $INPUT_NIX_PATH != "" ]]; then
|
if [[ $INPUT_NIX_PATH != "" ]]; then
|
||||||
echo "NIX_PATH=${INPUT_NIX_PATH}" >> "$GITHUB_ENV"
|
echo "NIX_PATH=${INPUT_NIX_PATH}" >> "$GITHUB_ENV"
|
||||||
|
Loading…
Reference in New Issue
Block a user