From a8d549351d4b87ab80665f35e57bee2a04201245 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 16 Jun 2023 19:18:26 -0400 Subject: [PATCH] home-manager: prioritize `-I` parameters In 176e455 the order between the action of `-I` parameters getting added to `EXTRA_NIX_PATH` and the action of a static path getting added to `EXTRA_NIX_PATH` was reversed, also reversing the order of `-I` parameters and the static `-I home-manager=...` leading to the static `-I home-manager=...` to always come before any of the `-I` parameters to later calls to Nix commands. This made it impossible to override the static Home Manager path when calling the home-manager tool with `-I home-manager=...`. This was previously possible. (cherry picked from commit edf9cf65238609db16680be74fe28d4d4858476e) --- home-manager/home-manager | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/home-manager b/home-manager/home-manager index 28f32258..552dcf98 100644 --- a/home-manager/home-manager +++ b/home-manager/home-manager @@ -883,7 +883,6 @@ COMMAND="" COMMAND_ARGS=() FLAKE_ARG="" -setHomeManagerNixPath setHomeManagerPathVariables while [[ $# -gt 0 ]]; do @@ -979,6 +978,8 @@ while [[ $# -gt 0 ]]; do esac done +setHomeManagerNixPath + if [[ -z $COMMAND ]]; then doHelp >&2 exit 1