Merge branch 'core-updates'

Conflicts:
	gnu/packages/bootstrap.scm
This commit is contained in:
Ludovic Courtès 2015-01-16 13:27:03 +01:00
commit 57b7e1a62d
98 changed files with 2277 additions and 987 deletions

View file

@ -281,8 +281,7 @@ smooth contours with constant curvature at the spline joins.")
(build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("libtool-bin" ,libtool "bin")))
("libtool" ,libtool)))
(arguments
`(#:phases (alist-cons-before
'configure 'bootstrap