automake: use 1.14.* as the default

I see 1.15 has been released recently,
but that's probably too new to be the default.
This commit is contained in:
Vladimír Čunát
2015-03-09 15:55:21 +01:00
committed by Peter Simons
parent a22c19f56a
commit 0619c852cb
4 changed files with 9 additions and 14 deletions
@@ -2,7 +2,7 @@
, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
, bash, makeWrapper, itstool, folks, libnotify, libxml2
, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
, libsoup, vala, dbus_glib, automake114x, autoconf }:
, libsoup, vala, dbus_glib, automake, autoconf }:
stdenv.mkDerivation rec {
name = "gnome-contacts-3.12.0";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
libxml2 libsoup gnome3.gnome_online_accounts nspr nss
gdk_pixbuf gnome3.gnome_icon_theme librsvg
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
vala automake114x autoconf db ];
vala automake autoconf db ];
preFixup = ''
for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
@@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, libxml2, upower
, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection
, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf
, bash, makeWrapper, itstool, vala, sqlite, automake, autoconf
, gnome3, librsvg, gdk_pixbuf, file, libnotify
, evolution_data_server, gst_all_1, poppler, libtool
, icu, taglib, libjpeg, libtiff, giflib, libcue
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
bzip2 gnome3.totem-pl-parser gobjectIntrospection
automake114x autoconf libtool
automake autoconf libtool
gnome3.gsettings_desktop_schemas makeWrapper file
gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
upower libnotify evolution_data_server gnome3.libgee