From 09fa6fbad69eed0083f950afbe0bbb6226b2043a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 5 Mar 2022 09:46:11 +0100
Subject: tv pkgs: import files and dirs as overlays harder

---
 tv/5pkgs/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'tv/5pkgs')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index cae5da112..9e9a3a9b8 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -3,12 +3,13 @@ with import <stockholm/lib>;
 self: super:
 
 # Import files and subdirectories like they are overlays.
-foldl' mergeAttrs {}
-  (map
-    (name: import (./. + "/${name}") self super)
-    (filter
-      (name: name != "default.nix" && !hasPrefix "." name)
-      (attrNames (readDir ./.))))
+fix
+  (foldl' (flip extends) (_: super)
+    (map
+      (name: import (./. + "/${name}"))
+      (filter
+        (name: name != "default.nix" && !hasPrefix "." name)
+        (attrNames (readDir ./.)))))
 
 //
 
-- 
cgit v1.2.3