Adding fbida, framebuffer image viewer

svn path=/nixpkgs/trunk/; revision=16571

pkgs/applications/graphics/fbida/default.nix

@@ -0,0 +1,34 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.attrByPath ["version"] "2.07" a; 
+  buildInputs = with a; [
+    libjpeg libexif giflib libtiff libpng
+      imagemagick ghostscript which curl 
+      pkgconfig freetype fontconfig
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://dl.bytesex.org/releases/fbida/fbida-${version}.tar.gz";
+    sha256 = "0i6v3fvjc305pfw48sglb5f22lwxldmfch6mjhqbcp7lqkkxw435";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+  makeFlags = [
+    "prefix=$out"
+    "verbose=yes"
+    ];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doMakeInstall" (a.doPatchShebangs "$out/bin")];
+      
+  name = "fbida-" + version;
+  meta = {
+    description = "Framebuffer image viewing programs";
+    maintainers = [
+    ];
+  };
+}

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

pkgs/top-level/all-packages.nix

@@ -6294,6 +6294,12 @@ let
     inherit (gtkLibs) gtk;
   };
 
+  fbida = builderDefsPackage ../applications/graphics/fbida {
+    inherit libjpeg libexif giflib libtiff libpng
+      imagemagick ghostscript which curl pkgconfig
+      freetype fontconfig;
+  };
+
   fdupes = import ../tools/misc/fdupes {
     inherit fetchurl stdenv;
   };