mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-13 20:30:02 +00:00
Code Activity

activation-scripts: don't link current system before all activationScripts finish

Browse source
This commit is contained in:
Daiderd Jordan 2017-03-04 19:41:13 +01:00
parent 328ce04664
commit 2e93c9ca29
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/system/activation-scripts.nix
View file

@ -50,6 +50,14 @@ in
# Ensure a consistent umask.
umask 0022
${cfg.activationScripts.nix-daemon.text}
${cfg.activationScripts.nix.text}
${cfg.activationScripts.etc.text}
${cfg.activationScripts.launchd.text}
${cfg.activationScripts.time.text}
${cfg.activationScripts.extraActivation.text}
# Make this configuration the current configuration.
# The readlink is there to ensure that when $systemConfig = /system
# (which is a symlink to the store), /run/current-system is still
@ -59,14 +67,6 @@ in
# Prevent the current configuration from being garbage-collected.
ln -sfn /run/current-system /nix/var/nix/gcroots/current-system
${cfg.activationScripts.nix-daemon.text}
${cfg.activationScripts.nix.text}
${cfg.activationScripts.etc.text}
${cfg.activationScripts.launchd.text}
${cfg.activationScripts.time.text}
${cfg.activationScripts.extraActivation.text}
exit $_status
'';