Skip to content

Make nix-daemon.sh idempotent #15005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
convoliution wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Make nix-daemon.sh idempotent #15005

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4f2a9c
Remove duplicate PATH entries
convoliution Jan 16, 2026
aba14b5
Remove duplicate XDG_DATA_DIRS entries
convoliution Jan 16, 2026
5628878
Touch up PATH logic
convoliution Jan 16, 2026
17a2111
Claim idempotency
convoliution Jan 16, 2026
707d2a3
For consistency, use @localstatedir@ instead of /nix/var
convoliution Jan 20, 2026
a340577
Merge branch 'master' into nix-profile-daemon-idempotent
convoliution Jan 24, 2026
c10f28c
Merge branch 'master' into nix-profile-daemon-idempotent
convoliution Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions scripts/nix-profile-daemon.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Only execute this file once per shell.
# This script is idempotent and can be executed more than once per shell.
# This file is tested by tests/installer/default.nix.
if [ -n "${__ETC_PROFILE_NIX_SOURCED:-}" ]; then return; fi
export __ETC_PROFILE_NIX_SOURCED=1

NIX_LINK=$HOME/.nix-profile
if [ -n "${XDG_STATE_HOME-}" ]; then
NIX_LINK_NEW="$XDG_STATE_HOME/nix/profile"
Expand Down Expand Up @@ -32,11 +29,17 @@ export NIX_PROFILES="@localstatedir@/nix/profiles/default $NIX_LINK"

# Populate bash completions, .desktop files, etc
if [ -z "${XDG_DATA_DIRS-}" ]; then
# According to XDG spec the default is /usr/local/share:/usr/share, don't set something that prevents that default
export XDG_DATA_DIRS="/usr/local/share:/usr/share:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
else
export XDG_DATA_DIRS="$XDG_DATA_DIRS:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
# This is the default according to the XDG spec
XDG_DATA_DIRS="/usr/local/share:/usr/share"
fi
# Append Nix share dirs to XDG_DATA_DIRS, after removing any duplicates
USER_NIX_SHARE="$NIX_LINK/share"
SYS_NIX_SHARE="@localstatedir@/nix/profiles/default/share"
XDG_DATA_DIRS=":$XDG_DATA_DIRS:" # wrap in ':'s for ease of processing
XDG_DATA_DIRS=$(printf '%s' "$XDG_DATA_DIRS" | sed "s|:$USER_NIX_SHARE:|:|g; s|:$SYS_NIX_SHARE:|:|g")
XDG_DATA_DIRS=$(printf '%s' "$XDG_DATA_DIRS" | sed "s|^:||; s|:$||") # unwrap ':'s
export XDG_DATA_DIRS="${XDG_DATA_DIRS:+"$XDG_DATA_DIRS:"}$USER_NIX_SHARE:$SYS_NIX_SHARE"
unset USER_NIX_SHARE SYS_NIX_SHARE

# Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work.
if [ -n "${NIX_SSL_CERT_FILE:-}" ]; then
Expand Down Expand Up @@ -68,5 +71,12 @@ else
unset -f check_nix_profiles
fi

export PATH="$NIX_LINK/bin:@localstatedir@/nix/profiles/default/bin:$PATH"
# Prepend Nix bin dirs to PATH, after removing any duplicates
USER_NIX_BIN="$NIX_LINK/bin"
SYS_NIX_BIN="@localstatedir@/nix/profiles/default/bin"
PATH=":$PATH:" # wrap in ':'s for ease of processing
PATH=$(printf '%s' "$PATH" | sed "s|:$USER_NIX_BIN:|:|g; s|:$SYS_NIX_BIN:|:|g")
PATH=$(printf '%s' "$PATH" | sed "s|^:||; s|:$||") # unwrap ':'s
export PATH="$USER_NIX_BIN:$SYS_NIX_BIN${PATH:+":$PATH"}"
unset USER_NIX_BIN SYS_NIX_BIN
unset NIX_LINK NIX_LINK_NEW