fix mergeAttrsWithFunc (also merge in names which are only in the snd attrs)

svn path=/nixpkgs/trunk/; revision=17406

1 files changed, 1 insertions, 1 deletions

diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index f09ab33f721..fc3bf2ce7cc 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -264,7 +264,7 @@ rec {
     fold (n: set : if (__hasAttr n set) 
                         then setAttr set n (f (__getAttr n set) (__getAttr n set2))
                         else set )
-           set1 (__attrNames set2);
+           (set2 // set1) (__attrNames set2);
 
   # merging two attribute set concatenating the values of same attribute names
   # eg { a = 7; } {  a = [ 2 3 ]; } becomes { a = [ 7 2 3 ]; }