From 81d28674b1c8fd4ad546160fd16954e2b74f9ffc Mon Sep 17 00:00:00 2001 From: Aryeh Hillman Date: Sat, 13 Jul 2024 15:36:48 -0700 Subject: [PATCH 1/3] Set `NIX_FIRST_BUILD_UID` to 701 on macOS --- scripts/install-darwin-multi-user.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 24c9052f91c..6b803c7fcf5 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -4,7 +4,7 @@ set -eu set -o pipefail # System specific settings -export NIX_FIRST_BUILD_UID="${NIX_FIRST_BUILD_UID:-301}" +export NIX_FIRST_BUILD_UID="${NIX_FIRST_BUILD_UID:-701}" export NIX_BUILD_USER_NAME_TEMPLATE="_nixbld%d" readonly NIX_DAEMON_DEST=/Library/LaunchDaemons/org.nixos.nix-daemon.plist From 919d99edddc47001060d9dcf813d5e4bfc81fa60 Mon Sep 17 00:00:00 2001 From: Aryeh Hillman Date: Sat, 13 Jul 2024 15:47:59 -0700 Subject: [PATCH 2/3] Start at 30001 --- scripts/install-darwin-multi-user.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 6b803c7fcf5..c41e45ac2e8 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -4,7 +4,7 @@ set -eu set -o pipefail # System specific settings -export NIX_FIRST_BUILD_UID="${NIX_FIRST_BUILD_UID:-701}" +export NIX_FIRST_BUILD_UID="${NIX_FIRST_BUILD_UID:-30001}" export NIX_BUILD_USER_NAME_TEMPLATE="_nixbld%d" readonly NIX_DAEMON_DEST=/Library/LaunchDaemons/org.nixos.nix-daemon.plist From 9c32866ac1644a46dd35a0e55e2ff3ff1249d813 Mon Sep 17 00:00:00 2001 From: Aryeh Hillman Date: Sun, 14 Jul 2024 09:41:12 -0700 Subject: [PATCH 3/3] Check if macOS version >= 15 Sequoia --- scripts/install-darwin-multi-user.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index c41e45ac2e8..280aaa0bab6 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -4,7 +4,11 @@ set -eu set -o pipefail # System specific settings -export NIX_FIRST_BUILD_UID="${NIX_FIRST_BUILD_UID:-30001}" +if [[ $(sw_vers -productVersion | cut -d '.' -f 1) -ge 15 ]]; then + export NIX_FIRST_BUILD_UID=${NIX_FIRST_BUILD_UID:-30001} +else + export NIX_FIRST_BUILD_UID=${NIX_FIRST_BUILD_UID:-301} +fi export NIX_BUILD_USER_NAME_TEMPLATE="_nixbld%d" readonly NIX_DAEMON_DEST=/Library/LaunchDaemons/org.nixos.nix-daemon.plist