From e82843144cfa9a1b3767f15f2b0493464afa597d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 12 Oct 2009 15:07:31 +0000
Subject: [PATCH] do not delay mkOverride on options which are does not have
 sub modules.

svn path=/nixpkgs/trunk/; revision=17758
---
 pkgs/lib/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index becd786d8cd..55e33c22614 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -118,7 +118,7 @@ rec {
     moduleApply { config = delayProperties; } module;
 
   evalDefinitions = opt: values:
-    if opt ? type && opt.type.delayOnGlobalEval then
+    if opt ? options && opt.options != [] && opt ? type && opt.type.delayOnGlobalEval then
       map (delayPropertiesWithIter opt.type.iter opt.name)
         (evalLocalProperties values)
     else