summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2022-03-05 09:46:11 +0100
committertv <tv@krebsco.de>2022-03-05 11:09:30 +0100
commitb6d96d3fcfce800ff01180bd5298f13b810eff0c (patch)
treef91819827fa6f6f4c9dc3fe2162514ae3f36110b
parent052612c2529bb292b8633693650218471af80d11 (diff)
tv pkgs: import files and dirs as overlays harder
-rw-r--r--tv/5pkgs/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index cae5da1..9e9a3a9 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 ./.)))))
//