diff --git a/pkgs/development/tools/misc/autoconf/autconf-libtool.nix b/pkgs/development/tools/misc/autoconf/autconf-libtool.nix new file mode 100644 index 000000000000..f07bd77fffd3 --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/autconf-libtool.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, m4, perl, libtool}: +derivation { + name = "autoconf-2.58-with-libtool"; + system = stdenv.system; + builder = ./libtoolbuilder.sh; + src = fetchurl { + url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.58.tar.bz2; + md5 = "db3fa3069c6554b3505799c7e1022e2b"; + }; + stdenv = stdenv; + m4 = m4; + perl = perl; + libtool = libtool; +} diff --git a/pkgs/development/tools/misc/autoconf/autoconf-libtool.nix b/pkgs/development/tools/misc/autoconf/autoconf-libtool.nix new file mode 100644 index 000000000000..b77fe727eeca --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/autoconf-libtool.nix @@ -0,0 +1,22 @@ +{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/libtoolbuilder.sh b/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh new file mode 100755 index 000000000000..34bdbcb35b76 --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh @@ -0,0 +1,28 @@ +#! /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 diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index d9f13f11763e..febe579a7c73 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, m4, perl}: derivation { - name = "autoconf-2.58"; + name = "libtool-1.5"; system = stdenv.system; builder = ./builder.sh; src = fetchurl { diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 855893cb2d0d..a5545e747898 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -140,6 +140,13 @@ perl = perl; }; + autoconflibtool = (import ../development/tools/misc/autoconf/autoconf-libtool.nix) { + fetchurl = fetchurl; + stdenv = stdenv; + m4 = gnum4; + perl = perl; + }; + automake = (import ../development/tools/misc/automake) { fetchurl = fetchurl; stdenv = stdenv; @@ -155,10 +162,10 @@ }; autotools = { - automake = automake; - autoconf = autoconf; + automake = autoconflibtool; + autoconf = autoconflibtool; make = gnumake; - libtool = libtool; + libtool = autoconflibtool; }; pkgconfig = (import ../development/tools/misc/pkgconfig) {