summary refs log tree commit diff
path: root/lib/modules.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 22:43:29 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 22:45:58 +0100
commit3115addf4c47fe6ca572188ec271ca567d505507 (patch)
tree618945c04d7510470bb64b049275335a45980fb1 /lib/modules.nix
parentc9dad37f01d138e74d0e72050db6eb6f7d074948 (diff)
downloadnixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.gz
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.bz2
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.lz
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.xz
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.zst
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.zip
Fix nixos-option
In particular, it no longer produces an "infinite recursion" error
when run with no arguments.
Diffstat (limited to 'lib/modules.nix')
-rw-r--r--lib/modules.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/modules.nix b/lib/modules.nix
index d2b74733944..1163274e6bf 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -160,6 +160,7 @@ rec {
       value = (opt.apply or id) merged;
     in opt //
       { value = addErrorContext "while evaluating the option `${showOption loc}':" value;
+        files = map (def: def.file) defs;
         definitions = map (def: def.value) defsFinal;
         isDefined = defsFinal != [];
       };