public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added libgd.

Browse Source 
* gnuplot 4.2.2.

svn path=/nixpkgs/trunk/; revision=9354
This commit is contained in:
Eelco Dolstra 2007-09-21 20:43:43 +00:00
parent 23f2a18677
commit ebacd32b71
3 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/gd/default.nix Normal file
View File

@ -0,0 +1,21 @@
{stdenv, fetchurl, zlib, libpng, freetype, libjpeg, fontconfig}:
stdenv.mkDerivation {
name = "gd-2.0.35";
src = fetchurl {
url = http://www.libgd.org/releases/gd-2.0.35.tar.bz2;
sha256 = "1y80lcmb8qbzf0a28841zxhq9ndfapmh2fsrqfd9lalxfj8288mz";
};
buildInputs = [zlib libpng freetype];
propagatedBuildInputs = [libjpeg fontconfig]; # urgh
configureFlags = "--without-x";
meta = {
homepage = http://www.libgd.org/;
description = "An open source code library for the dynamic creation of images by programmers";
};
}

27
pkgs/tools/graphics/gnuplot/default.nix
View File

@ -1,30 +1,29 @@
{stdenv, fetchurl, zlib, libpng, texinfo, { stdenv, fetchurl, zlib, gd, texinfo
libX11 ? null, , libX11 ? null
libXt ? null, , libXt ? null
libXpm ? null, , libXpm ? null
libXaw ? null, , libXaw ? null
x11Support ? false , x11Support ? false
}: }:
assert x11Support -> ((libX11 != null) && assert x11Support -> ((libX11 != null) &&
(libXt != null) && (libXpm != null) && (libXt != null) && (libXpm != null) &&
(libXaw != null)); (libXaw != null));
stdenv.mkDerivation { stdenv.mkDerivation {
# Gnuplot (which isn't open source) has a license that requires that # Gnuplot (which isn't open source) has a license that requires that
# we "add special version identification to distinguish your version # we "add special version identification to distinguish your version
# in addition to the base release version number". Hence the "nix" # in addition to the base release version number". Hence the "nix"
# suffix. # suffix.
name = "gnuplot-4.0-nix"; name = "gnuplot-4.2.2-nix";
# builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/gnuplot/gnuplot-4.0.0.tar.gz; url = mirror://sourceforge/gnuplot/gnuplot-4.2.2.tar.gz;
md5 = "66258443d9f93cc4f46b147dac33e63a"; sha256 = "14ca8wwdb4hdsgs51fqlrkcny3d4rm1vs54sfg5d0hr7iw2qlvvm";
}; };
configureFlags = if x11Support then ["--with-x"] else ["--without-x"]; configureFlags = if x11Support then ["--with-x"] else ["--without-x"];
buildInputs = [zlib libpng texinfo] ++ buildInputs = [zlib gd texinfo] ++
(if x11Support then [libX11 libXt libXpm libXaw] else []); (if x11Support then [libX11 libXt libXpm libXaw] else []);
} }

6
pkgs/top-level/all-packages.nix
View File

@ -429,7 +429,7 @@ rec {
}; };
gnuplot = import ../tools/graphics/gnuplot { gnuplot = import ../tools/graphics/gnuplot {
inherit fetchurl stdenv zlib libpng texinfo; inherit fetchurl stdenv zlib gd texinfo;
}; };
gnuplotX = import ../tools/graphics/gnuplot { gnuplotX = import ../tools/graphics/gnuplot {
@ -1538,6 +1538,10 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
gd = import ../development/libraries/gd {
inherit fetchurl stdenv zlib libpng freetype libjpeg fontconfig;
};
gdal = stdenv.mkDerivation { gdal = stdenv.mkDerivation {
name = "gdal-1.4.2"; name = "gdal-1.4.2";
src = fetchurl { src = fetchurl {