* Provide a wrapper around `aclocal' (in Automake) that automatically

adds all directories specified in `ACLOCAL_PATH' to the `aclocal'
  command line as `-I' flags.  Also, it provides a setup hook that
  adds the `.../share/aclocal' directory of every build input to
  `ACLOCAL_PATH'.

* Upgraded Libtool.

* Graphviz requires the X Athena widgets, which in turn requires the X
  miscellaneous utilities library; added those.  However it doesn't
  work yet since libXt is broken.
  

svn path=/nixpkgs/trunk/; revision=888
This commit is contained in:
Eelco Dolstra
2004-03-31 22:47:06 +00:00
parent cbdf9a0408
commit 817d1b27ef
15 changed files with 102 additions and 119 deletions
@@ -1,22 +0,0 @@
{stdenv, fetchurl, m4, perl}:
derivation {
name = "autoconf-2.58-automake-1.7.9-libtool-1.5";
system = stdenv.system;
builder = ./libtoolbuilder.sh;
autoconfsrc = fetchurl {
url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.58.tar.bz2;
md5 = "db3fa3069c6554b3505799c7e1022e2b";
};
automakesrc = fetchurl {
url = ftp://ftp.nluug.nl/pub/gnu/automake/automake-1.7.9.tar.bz2;
md5 = "571fd0b0598eb2a27dcf68adcfddfacb";
};
libtoolsrc = fetchurl {
url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz;
md5 = "0e1844f25e2ad74c3715b5776d017545";
};
stdenv = stdenv;
m4 = m4;
perl = perl;
}
@@ -1,8 +0,0 @@
buildinputs="$m4 $perl"
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
cd autoconf-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
@@ -1,11 +1,10 @@
{stdenv, fetchurl, m4, perl}:
stdenv.mkDerivation {
name = "autoconf-2.58";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.58.tar.bz2;
md5 = "db3fa3069c6554b3505799c7e1022e2b";
};
m4 = m4;
perl = perl;
buildInputs = [m4 perl];
}
@@ -1,28 +0,0 @@
#! /bin/sh
buildinputs="$m4 $perl $out"
. $stdenv/setup || exit 1
tar xvfj $autoconfsrc || exit 1
cd autoconf-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
buildinputs="$m4 $perl $out"
. $stdenv/setup || exit 1
tar xvfj $automakesrc || exit 1
cd automake-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
buildinputs="$m4 $perl $out"
. $stdenv/setup || exit 1
tar xvfz $libtoolsrc || exit 1
cd libtool-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1