diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-31 22:47:06 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-31 22:47:06 +0000 |
| commit | 817d1b27ef4994b4f9533e0cfb8ab86b7d4a4514 (patch) | |
| tree | 365fddcddcf02630185e785e65c66b93c27f09f1 /pkgs/development/tools/misc/autoconf | |
| parent | cbdf9a040841a6133ff47b3ec65cb46d2e1c8f04 (diff) | |
* 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
Diffstat (limited to 'pkgs/development/tools/misc/autoconf')
4 files changed, 2 insertions, 61 deletions
diff --git a/pkgs/development/tools/misc/autoconf/autoconf-libtool.nix b/pkgs/development/tools/misc/autoconf/autoconf-libtool.nix deleted file mode 100644 index b77fe727eec..00000000000 --- a/pkgs/development/tools/misc/autoconf/autoconf-libtool.nix +++ /dev/null @@ -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; -} - diff --git a/pkgs/development/tools/misc/autoconf/builder.sh b/pkgs/development/tools/misc/autoconf/builder.sh deleted file mode 100644 index de4db475aaa..00000000000 --- a/pkgs/development/tools/misc/autoconf/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index c850d1fb8fe..7af57fb703a 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -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]; } diff --git a/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh b/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh deleted file mode 100644 index 34bdbcb35b7..00000000000 --- a/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh +++ /dev/null @@ -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
\ No newline at end of file |