diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-08-04 07:14:43 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-08-04 07:14:43 +0000 |
| commit | 890cf33ef7133af0d66f52183474acf51e878e47 (patch) | |
| tree | 4873956a569dd19eaca9f257152dde3923249aff /pkgs/build-support/builder-defs | |
| parent | 15ac66ea0bcc92b186458f14b87f3fcaf1c1749d (diff) | |
| download | nixlib-890cf33ef7133af0d66f52183474acf51e878e47.tar nixlib-890cf33ef7133af0d66f52183474acf51e878e47.tar.gz nixlib-890cf33ef7133af0d66f52183474acf51e878e47.tar.bz2 nixlib-890cf33ef7133af0d66f52183474acf51e878e47.tar.lz nixlib-890cf33ef7133af0d66f52183474acf51e878e47.tar.xz nixlib-890cf33ef7133af0d66f52183474acf51e878e47.tar.zst nixlib-890cf33ef7133af0d66f52183474acf51e878e47.zip | |
Adding fbida, framebuffer image viewer
svn path=/nixpkgs/trunk/; revision=16571
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 |