From 1c66b3e0c0cbf04dd84986ab4251f7799f8f00fc Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 23:33:58 +0000
Subject: [PATCH] Fix activation script's merge function.

svn path=/nixos/branches/fix-style/; revision=14199
---
 system/activate-configuration.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/activate-configuration.nix b/system/activate-configuration.nix
index 25510aa26bd..72a17d6dfd7 100644
--- a/system/activate-configuration.nix
+++ b/system/activate-configuration.nix
@@ -3,7 +3,8 @@
 
 let
   inherit (pkgs.stringsWithDeps) textClosureOverridable noDepEntry;
-  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten mapAttrs;
+  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten
+    mapAttrs addErrorContext fold;
 
   textClosure = steps:
     textClosureOverridable steps (
@@ -44,8 +45,9 @@ in
         Activate the new configuration (i.e., update /etc, make accounts,
         and so on).
       '';
-      merge = mergeTypedOption "script" builtins.isAttrs mergeAttrs;
-      apply = set: let lib = addAttributeName set; in {
+      merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
+      apply = set:
+        let lib = addAttributeName set; in {
         inherit lib; # used to fetch dependencies.
         script = aggregateScripts "activationScript" lib;
       };