diff options
| author | tv <tv@krebsco.de> | 2017-08-01 19:28:47 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-08-01 19:43:15 +0200 |
| commit | e4042e132a50c343d3b42039140abb0695724e69 (patch) | |
| tree | 0ab6b59ea66b6314925233a5705cef962b02469f | |
| parent | d56a90778408a199cc79ab47e1c2313a68cd2451 (diff) | |
move subdirsOf from lib to makefu
| -rw-r--r-- | lib/default.nix | 4 | ||||
| -rw-r--r-- | makefu/5pkgs/default.nix | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/default.nix b/lib/default.nix index 4c54f60aa..e5e40975e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -20,10 +20,6 @@ let then lib.lpad n c (c + s) else s; - subdirsOf = path: - lib.mapAttrs (name: _: path + "/${name}") - (filterAttrs (_: eq "directory") (readDir path)); - genAttrs' = names: f: listToAttrs (map f names); getAttrs = names: set: diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 99f8cf864..bb776ef25 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -15,6 +15,10 @@ self: super: let override else override; + subdirsOf = path: + mapAttrs (name: _: path + "/${name}") + (filterAttrs (_: eq "directory") (readDir path)); + in { alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";}; @@ -27,7 +31,6 @@ in { sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; }; }; - } // mapAttrs (_: flip callPackage {}) |