kevinveenbirkenbach/pkgmgr
1
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

pkgmgr-wrapper: improve Nix detection and auto-initialization
Some checks failed
Mark stable commit / test-unit (push) Has been cancelled
Details
Mark stable commit / test-integration (push) Has been cancelled
Details
Mark stable commit / test-container (push) Has been cancelled
Details
Mark stable commit / test-e2e (push) Has been cancelled
Details
Mark stable commit / test-virgin-user (push) Has been cancelled
Details
Mark stable commit / test-virgin-root (push) Has been cancelled
Details
Mark stable commit / mark-stable (push) Has been cancelled
Details

Browse Source 
- Extend PATH probing to include /home/nix/.nix-profile/bin/nix (container mode).
- Automatically invoke init-nix.sh when nix is not found before first run.
- Ensure pkgmgr always attempts a one-time Nix initialization instead of failing prematurely.
- Improve error message to clarify that nix was still missing *after* initialization attempt.
- Keep existing flake-based execution path unchanged (exec nix run …).

This makes the wrapper fully reliable across Debian/Ubuntu package installs,
fresh containers, and minimal systems where Nix is not yet initialized.

https://chatgpt.com/share/693b005d-b250-800f-8830-ab71685f51b3
This commit is contained in:
Kevin Veen-Birkenbach
2025-12-11 18:33:02 +01:00
parent e49dd85200
commit a3b21f23fc
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/pkgmgr-wrapper.sh
View File

@@ -8,19 +8,18 @@ fi
FLAKE_DIR="/usr/lib/package-manager" FLAKE_DIR="/usr/lib/package-manager"
# ------------------------------------------------------------ # ---------------------------------------------------------------------------
# Try to ensure that "nix" is on PATH # Try to ensure that "nix" is on PATH (common locations + container user)
# ------------------------------------------------------------ # ---------------------------------------------------------------------------
if ! command -v nix >/dev/null 2>&1; then if ! command -v nix >/dev/null 2>&1; then
# Common locations for Nix installations
CANDIDATES=( CANDIDATES=(
"/nix/var/nix/profiles/default/bin/nix" "/nix/var/nix/profiles/default/bin/nix"
"${HOME:-/root}/.nix-profile/bin/nix" "${HOME:-/root}/.nix-profile/bin/nix"
"/home/nix/.nix-profile/bin/nix"
) )
for candidate in "${CANDIDATES[@]}"; do for candidate in "${CANDIDATES[@]}"; do
if [[ -x "$candidate" ]]; then if [[ -x "$candidate" ]]; then
# Prepend the directory of the candidate to PATH
PATH="$(dirname "$candidate"):${PATH}" PATH="$(dirname "$candidate"):${PATH}"
export PATH export PATH
break break
@@ -28,13 +27,22 @@ if ! command -v nix >/dev/null 2>&1; then
done done
fi fi
# ------------------------------------------------------------ # ---------------------------------------------------------------------------
# Primary (and only) path: use Nix flake if available # If nix is still missing, try to run init-nix.sh once
# ------------------------------------------------------------ # ---------------------------------------------------------------------------
if ! command -v nix >/dev/null 2>&1; then
if [[ -x "${FLAKE_DIR}/init-nix.sh" ]]; then
"${FLAKE_DIR}/init-nix.sh" || true
fi
fi
# ---------------------------------------------------------------------------
# Primary path: use Nix flake if available
# ---------------------------------------------------------------------------
if command -v nix >/dev/null 2>&1; then if command -v nix >/dev/null 2>&1; then
exec nix run "${FLAKE_DIR}#pkgmgr" -- "$@" exec nix run "${FLAKE_DIR}#pkgmgr" -- "$@"
fi fi
echo "[pkgmgr-wrapper] ERROR: 'nix' binary not found on PATH." echo "[pkgmgr-wrapper] ERROR: 'nix' binary not found on PATH after init."
echo "[pkgmgr-wrapper] Nix is required to run pkgmgr (no Python fallback)." echo "[pkgmgr-wrapper] Nix is required to run pkgmgr (no Python fallback)."
exit 1 exit 1