wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 20:01: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

3
scripts/install-systemd-multi-user.sh
View file

@ -3,14 +3,11 @@
set -eu
set -o pipefail
<<<<<<< HEAD
=======
# System specific settings
export NIX_FIRST_BUILD_UID="${NIX_FIRST_BUILD_UID:-30001}"
export NIX_BUILD_GROUP_ID="${NIX_BUILD_GROUP_ID:-30000}"
export NIX_BUILD_USER_NAME_TEMPLATE="nixbld%d"
>>>>>>> 75567423f (install-darwin: move nixbld gid to match first UID)
readonly SERVICE_SRC=/lib/systemd/system/nix-daemon.service
readonly SERVICE_DEST=/etc/systemd/system/nix-daemon.service