diff options
Diffstat (limited to 'pkgs/build-support/builder-defs')
| -rw-r--r-- | pkgs/build-support/builder-defs/builder-defs.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 17a49b69413f..94d3ea8265cd 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -449,10 +449,14 @@ let inherit (builtins) head tail trace; in ); builderDefsPackage = bd: func: - foldArgs - (x: y: ((func (bd // x // y)) // y)) - (innerBuilderDefsPackage bd) - {}; + if (builtins.isFunction func) then + (foldArgs + (x: y: ((func (bd // x // y)) // y)) + (innerBuilderDefsPackage bd) + {}) + else + (builderDefsPackage bd (import (toString func))) + ; generateFontsFromSFD = fullDepEntry ('' for i in *.sfd; do |