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/libtool | |
| parent | cbdf9a040841a6133ff47b3ec65cb46d2e1c8f04 (diff) | |
| download | nixpkgs-817d1b27ef4994b4f9533e0cfb8ab86b7d4a4514.tar nixpkgs-817d1b27ef4994b4f9533e0cfb8ab86b7d4a4514.tar.gz nixpkgs-817d1b27ef4994b4f9533e0cfb8ab86b7d4a4514.tar.bz2 nixpkgs-817d1b27ef4994b4f9533e0cfb8ab86b7d4a4514.tar.lz nixpkgs-817d1b27ef4994b4f9533e0cfb8ab86b7d4a4514.tar.xz nixpkgs-817d1b27ef4994b4f9533e0cfb8ab86b7d4a4514.tar.zst nixpkgs-817d1b27ef4994b4f9533e0cfb8ab86b7d4a4514.zip | |
* 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/libtool')
| -rw-r--r-- | pkgs/development/tools/misc/libtool/builder.sh | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/libtool/default.nix | 11 |
2 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/tools/misc/libtool/builder.sh b/pkgs/development/tools/misc/libtool/builder.sh deleted file mode 100644 index 4b8407fb533..00000000000 --- a/pkgs/development/tools/misc/libtool/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -buildinputs="$m4 $perl" -. $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd libtool-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index e02658af93a..9bf3574fec6 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -1,11 +1,10 @@ {stdenv, fetchurl, m4, perl}: + stdenv.mkDerivation { - name = "libtool-1.5"; - builder = ./builder.sh; + name = "libtool-1.5.2"; src = fetchurl { - url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz; - md5 = "0e1844f25e2ad74c3715b5776d017545"; + url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.2.tar.gz; + md5 = "db66ba05502f533ad0cfd84dc0e03bd5"; }; - m4 = m4; - perl = perl; + buildInputs = [m4 perl]; } |