Adding htmldoc. I had to update fltk 1.1 for it to build.

svn path=/nixpkgs/trunk/; revision=22096
This commit is contained in:
Lluís Batlle i Rossell 2010-06-01 21:15:40 +00:00
parent 473d5a9ba8
commit a2e353cd50
3 changed files with 24 additions and 3 deletions

View file

@ -0,0 +1,16 @@
{ stdenv, fetchurl, fltk, openssl, libpng, libjpeg }:
stdenv.mkDerivation rec {
name = "htmldoc-1.8.27";
src = fetchurl {
url = http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2;
sha256 = "04wnxgx6fxdxwiy9vbawdibngwf55mi01hjrr5fkfs22fcix5zw9";
};
buildInputs = [ fltk openssl libpng libjpeg ];
meta = {
homepage = http://www.htmldoc.org/;
description = "Converts HTML files to indexed HTML, PS or PDF";
license = "GPLv2";
maintainers = with stdenv.lib.maintainers; [ viric ];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -2,11 +2,11 @@ args: with args;
let inherit (args.composableDerivation) composableDerivation edf; in let inherit (args.composableDerivation) composableDerivation edf; in
composableDerivation {} { composableDerivation {} {
name = "fltk-1.1.9"; name = "fltk-1.1.10";
src = args.fetchurl { src = args.fetchurl {
url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.9/fltk-1.1.9-source.tar.bz2; url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2;
sha256 = "1ppdqc4vg3g11px4dxm6czxi4sswfxs485q44nrr5ji0galsbjzs"; sha256 = "16mic69a48y3ybijml754x38djxxb25rn8441p9qsssqy8ms5b9p";
}; };
propagatedBuildInputs=[x11 inputproto libXi freeglut]; propagatedBuildInputs=[x11 inputproto libXi freeglut];

View file

@ -7969,6 +7969,11 @@ let
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
}; };
htmldoc = import ../applications/misc/htmldoc {
inherit fetchurl stdenv openssl libpng libjpeg;
fltk = fltk11;
};
hugin = import ../applications/graphics/hugin { hugin = import ../applications/graphics/hugin {
inherit fetchurl stdenv cmake panotools libtiff libpng boost pkgconfig inherit fetchurl stdenv cmake panotools libtiff libpng boost pkgconfig
exiv2 gettext ilmbase enblendenfuse autopanosiftc mesa freeglut exiv2 gettext ilmbase enblendenfuse autopanosiftc mesa freeglut