From e9cf7650763322f484141ab7a46fc3dbb0b26d1a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 13 May 2017 19:57:15 +0200
Subject: activation-scripts: run custom activation scripts first

---
 modules/system/activation-scripts.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules/system')

diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix
index c55c0c3..069d8da 100644
--- a/modules/system/activation-scripts.nix
+++ b/modules/system/activation-scripts.nix
@@ -50,13 +50,14 @@ in
       # Ensure a consistent umask.
       umask 0022
 
+      ${cfg.activationScripts.extraActivation.text}
+
       ${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
@@ -84,9 +85,10 @@ in
       # Ensure a consistent umask.
       umask 0022
 
+      ${cfg.activationScripts.extraUserActivation.text}
+
       ${cfg.activationScripts.defaults.text}
       ${cfg.activationScripts.userLaunchd.text}
-      ${cfg.activationScripts.extraUserActivation.text}
 
       exit $_status
     '';
-- 
cgit v1.2.3