diff --git a/README.md b/README.md index da8b4de..3c15c7a 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ with developers. - `nix_path`: set `NIX_PATH` environment variable (if set `skip_adding_nixpkgs_channel` will be implicitly enabled) - `skip_adding_nixpkgs_channel`: set to `true` to skip adding nixpkgs-unstable channel (and save ~5s for each job build) +- `extra_nix_config`: gets appended to `/etc/nix/nix.conf` if passed. --- diff --git a/action.yml b/action.yml index aac769c..c5124a7 100644 --- a/action.yml +++ b/action.yml @@ -8,6 +8,8 @@ inputs: description: 'Set NIX_PATH environment variable. If set "skip_adding_nixpkgs_channel" will be implicitly enabled' skip_adding_nixpkgs_channel: description: 'Skip adding nixpkgs-unstable channel' + extra_nix_config: + description: 'gets appended to `/etc/nix/nix.conf` if passed.' branding: color: 'blue' icon: 'sun' diff --git a/lib/install-nix.sh b/lib/install-nix.sh index 01f65df..1cc2175 100755 --- a/lib/install-nix.sh +++ b/lib/install-nix.sh @@ -5,16 +5,25 @@ set -euo pipefail sudo sh -c 'echo max-jobs = auto >> /tmp/nix.conf' # Allow binary caches for runner user sudo sh -c 'echo trusted-users = root runner >> /tmp/nix.conf' +if [[ -n $INPUT_EXTRA_NIX_CONFIG ]]; then + echo "$INPUT_EXTRA_NIX_CONFIG" >> /tmp/nix.conf +fi -if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL = "true" || $INPUT_NIX_PATH != "" ]]; then - extra_cmd=--no-channel-add +install_options=( + --daemon + --daemon-user-count 4 + --nix-extra-conf-file /tmp/nix.conf + --darwin-use-unencrypted-nix-store-volume +) + +if [[ $INPUT_SKIP_ADDING_NIXPKGS_CHANNEL = "true" || -n $INPUT_NIX_PATH ]]; then + install_options+=(--no-channel-add) else - extra_cmd= INPUT_NIX_PATH="/nix/var/nix/profiles/per-user/root/channels" fi -sh <(curl --retry 5 --retry-connrefused -L ${INPUT_INSTALL_URL:-https://nixos.org/nix/install}) \ - --daemon --daemon-user-count 4 --nix-extra-conf-file /tmp/nix.conf --darwin-use-unencrypted-nix-store-volume $extra_cmd +sh <(curl --retry 5 --retry-connrefused -L "${INPUT_INSTALL_URL:-https://nixos.org/nix/install}") \ + "${install_options[@]}" if [[ $OSTYPE =~ darwin ]]; then # Disable spotlight indexing of /nix to speed up performance