wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 16:51:15 +02:00
Code Activity

Merge branch '2.19-maintenance' into mergify/bp/2.19-maintenance/pr-10919

Browse source
This commit is contained in:
tomberek 2024-09-10 23:41:18 -04:00 • committed by GitHub
commit 35c27ce261
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/install-darwin-multi-user.sh
View file

@ -3,8 +3,6 @@
set -eu
set -o pipefail
<<<<<<< HEAD
=======
# System specific settings
# Notes:
# - up to macOS Big Sur we used the same GID/UIDs as Linux (30000:30001-32)
@ -19,12 +17,9 @@ export NIX_FIRST_BUILD_UID="${NIX_FIRST_BUILD_UID:-351}"
export NIX_BUILD_GROUP_ID="${NIX_BUILD_GROUP_ID:-350}"
export NIX_BUILD_USER_NAME_TEMPLATE="_nixbld%d"
>>>>>>> df36ff0d1 (install-darwin: fix _nixbld uids for macOS sequoia)
readonly NIX_DAEMON_DEST=/Library/LaunchDaemons/org.nixos.nix-daemon.plist
# create by default; set 0 to DIY, use a symlink, etc.
readonly NIX_VOLUME_CREATE=${NIX_VOLUME_CREATE:-1} # now default
NIX_FIRST_BUILD_UID="301"
NIX_BUILD_USER_NAME_TEMPLATE="_nixbld%d"
# caution: may update times on / if not run as normal non-root user
read_only_root() {