diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-10-15 12:09:10 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-10-15 12:09:10 +0000 |
| commit | 80fee739e29faf7e85d4fba50bb95f0f40d2163a (patch) | |
| tree | 5e3d0e2325a0d58d0d95272a5a079be738856ffc | |
| parent | 1758b488e6a06d12975ba6d7ab25cb6419329e3c (diff) | |
| download | nixlib-80fee739e29faf7e85d4fba50bb95f0f40d2163a.tar nixlib-80fee739e29faf7e85d4fba50bb95f0f40d2163a.tar.gz nixlib-80fee739e29faf7e85d4fba50bb95f0f40d2163a.tar.bz2 nixlib-80fee739e29faf7e85d4fba50bb95f0f40d2163a.tar.lz nixlib-80fee739e29faf7e85d4fba50bb95f0f40d2163a.tar.xz nixlib-80fee739e29faf7e85d4fba50bb95f0f40d2163a.tar.zst nixlib-80fee739e29faf7e85d4fba50bb95f0f40d2163a.zip | |
GNU Automake: Default to 1.11.x.
svn path=/nixpkgs/trunk/; revision=24299
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08f65171d914..dc959e8e7b7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2260,7 +2260,7 @@ let autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; - automake = automake110x; + automake = automake111x; automake17x = callPackage ../development/tools/misc/automake/automake-1.7.x.nix { }; @@ -4262,7 +4262,11 @@ let inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig libxslt expat libdrm libpng zlib perl mesa xkeyboard_config dbus hal libuuid openssl gperf m4 - automake autoconf libtool xmlto asciidoc udev; + autoconf libtool xmlto asciidoc udev; + + # XXX: Update to newer Automake on the next big rebuild; better yet: + # remove the dependency on Automake. + automake = automake110x; # !!! pythonBase is used instead of python because this causes an # infinite recursion when the flag python.full is set to true. |