Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move subdirsOf from lib to makefu

Browse Source
This commit is contained in:
tv 2017-08-01 19:28:47 +02:00
parent d56a907784
commit e4042e132a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/default.nix
View File

@ -20,10 +20,6 @@ let
then lib.lpad n c (c + s) then lib.lpad n c (c + s)
else s; else s;
subdirsOf = path:
lib.mapAttrs (name: _: path + "/${name}")
(filterAttrs (_: eq "directory") (readDir path));
genAttrs' = names: f: listToAttrs (map f names); genAttrs' = names: f: listToAttrs (map f names);
getAttrs = names: set: getAttrs = names: set:

5
makefu/5pkgs/default.nix
View File

@ -15,6 +15,10 @@ self: super: let
override override
else override; else override;
subdirsOf = path:
mapAttrs (name: _: path + "/${name}")
(filterAttrs (_: eq "directory") (readDir path));
in { in {
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";}; alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
@ -27,7 +31,6 @@ in {
sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
}; };
}; };
} }
// mapAttrs (_: flip callPackage {}) // mapAttrs (_: flip callPackage {})