summary refs log tree commit diff
path: root/pkgs/lib/modules.nix
diff options
context:
space:
mode:
authorNicolas Pierron <nicolas.b.pierron@gmail.com>2009-09-28 18:22:24 +0000
committerNicolas Pierron <nicolas.b.pierron@gmail.com>2009-09-28 18:22:24 +0000
commitfad1b41fe40cd7951f649d8da711a1d1f41f841f (patch)
tree4d90528a06d1dd7bc40a2d8a3ccf317449e8390c /pkgs/lib/modules.nix
parente6399964cb628b705a8acf52223c4fd99229a43c (diff)
downloadnixpkgs-fad1b41fe40cd7951f649d8da711a1d1f41f841f.tar
nixpkgs-fad1b41fe40cd7951f649d8da711a1d1f41f841f.tar.gz
nixpkgs-fad1b41fe40cd7951f649d8da711a1d1f41f841f.tar.bz2
nixpkgs-fad1b41fe40cd7951f649d8da711a1d1f41f841f.tar.lz
nixpkgs-fad1b41fe40cd7951f649d8da711a1d1f41f841f.tar.xz
nixpkgs-fad1b41fe40cd7951f649d8da711a1d1f41f841f.tar.zst
nixpkgs-fad1b41fe40cd7951f649d8da711a1d1f41f841f.zip
externals argumental are now taking precedence over the result of
moduleMerge because we may need to alter the result of the configuration
before using it inside other options.

svn path=/nixpkgs/trunk/; revision=17477
Diffstat (limited to 'pkgs/lib/modules.nix')
-rw-r--r--pkgs/lib/modules.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index c29d2870d98..f0638da3c00 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -280,7 +280,7 @@ rec {
       let module = { inherit (result) options config; }; in
 
       moduleMerge "" (
-        moduleClosure initModules (args // module)
+        moduleClosure initModules (module // args)
       )
     );