From 890cf33ef7133af0d66f52183474acf51e878e47 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 4 Aug 2009 07:14:43 +0000
Subject: Adding fbida, framebuffer image viewer

svn path=/nixpkgs/trunk/; revision=16571
---
 pkgs/build-support/builder-defs/builder-defs.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'pkgs/build-support/builder-defs')

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
-- 
cgit 1.4.1