Skip to content

Commit 7556742

Browse files
committed
install-darwin: move nixbld gid to match first UID
1 parent df36ff0 commit 7556742

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

scripts/install-multi-user.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ readonly RED='\033[31m'
2323
# installer allows overriding build user count to speed up installation
2424
# as creating each user takes non-trivial amount of time on macos
2525
readonly NIX_USER_COUNT=${NIX_USER_COUNT:-32}
26-
readonly NIX_BUILD_GROUP_ID="${NIX_BUILD_GROUP_ID:-30000}"
2726
readonly NIX_BUILD_GROUP_NAME="nixbld"
2827
# each system specific installer must set these:
2928
# NIX_FIRST_BUILD_UID
29+
# NIX_BUILD_GROUP_ID
3030
# NIX_BUILD_USER_NAME_TEMPLATE
3131
# Please don't change this. We don't support it, because the
3232
# default shell profile that comes with Nix doesn't support it.
@@ -530,9 +530,7 @@ It seems the build group $NIX_BUILD_GROUP_NAME already exists, but
530530
with the UID $primary_group_id. This script can't really handle
531531
that right now, so I'm going to give up.
532532
533-
You can fix this by editing this script and changing the
534-
NIX_BUILD_GROUP_ID variable near the top to from $NIX_BUILD_GROUP_ID
535-
to $primary_group_id and re-run.
533+
You can export NIX_BUILD_GROUP_ID=$primary_group_id and re-run.
536534
EOF
537535
else
538536
row " Exists" "Yes"

scripts/install-systemd-multi-user.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -o pipefail
55

66
# System specific settings
77
export NIX_FIRST_BUILD_UID="${NIX_FIRST_BUILD_UID:-30001}"
8+
export NIX_BUILD_GROUP_ID="${NIX_BUILD_GROUP_ID:-30000}"
89
export NIX_BUILD_USER_NAME_TEMPLATE="nixbld%d"
910

1011
readonly SERVICE_SRC=/lib/systemd/system/nix-daemon.service

0 commit comments

Comments
 (0)