public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GNU Automake: Default to 1.11.x. 

svn path=/nixpkgs/trunk/; revision=24299
This commit is contained in:
Ludovic Courtès 2010-10-15 12:09:10 +00:00
parent 1758b488e6
commit 80fee739e2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -2260,7 +2260,7 @@ let
autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
automake = automake110x; automake = automake111x;
automake17x = callPackage ../development/tools/misc/automake/automake-1.7.x.nix { }; automake17x = callPackage ../development/tools/misc/automake/automake-1.7.x.nix { };
@ -4262,7 +4262,11 @@ let
inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa libxslt expat libdrm libpng zlib perl mesa
xkeyboard_config dbus hal libuuid openssl gperf m4 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 # !!! pythonBase is used instead of python because this causes an
# infinite recursion when the flag python.full is set to true. # infinite recursion when the flag python.full is set to true.