summaryrefslogtreecommitdiff
path: root/modules/services/activate-system
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2020-10-25 15:17:36 +0100
committerDaiderd Jordan <daiderd@gmail.com>2020-10-25 15:56:29 +0100
commit74eb216078b9323e2d3061fe3c45bd2f2a633472 (patch)
treea00534460d6e9ad168962deba4c0e2df085fdf69 /modules/services/activate-system
parent5dfd0c44857c32f600ea7b4e86db7377bb9d997f (diff)
remove nix 1.x config compatibility
Diffstat (limited to 'modules/services/activate-system')
-rw-r--r--modules/services/activate-system/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/services/activate-system/default.nix b/modules/services/activate-system/default.nix
index bf2a5d2..f8b3043 100644
--- a/modules/services/activate-system/default.nix
+++ b/modules/services/activate-system/default.nix
@@ -21,6 +21,10 @@ in
launchd.daemons.activate-system = {
script = ''
+ set -e
+ set -o pipefail
+ export PATH="${pkgs.gnugrep}/bin:${pkgs.coreutils}/bin:@out@/sw/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+
# 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
@@ -31,7 +35,6 @@ in
ln -sfn /run/current-system /nix/var/nix/gcroots/current-system
${config.system.activationScripts.keyboard.text}
- ${config.system.activationScripts.nix.text}
'';
serviceConfig.RunAtLoad = true;
serviceConfig.KeepAlive.SuccessfulExit = false;