tv pkgs: import files and dirs as overlays harder

tv/5pkgs/default.nix

@@ -3,12 +3,13 @@ with import <stockholm/lib>;
 self: super:
 
 # Import files and subdirectories like they are overlays.
-foldl' mergeAttrs {}
+fix
+  (foldl' (flip extends) (_: super)
     (map
-    (name: import (./. + "/${name}") self super)
+      (name: import (./. + "/${name}"))
       (filter
         (name: name != "default.nix" && !hasPrefix "." name)
-      (attrNames (readDir ./.))))
+        (attrNames (readDir ./.)))))
 
 //