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

treewide: remove automake pinning to the newest version

Browse Source 
quasi no-op
This commit is contained in:
Robin Gloster 2017-08-12 18:49:24 +02:00
parent 354b3cda36
commit bb5702c521
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/pcmanx-gtk2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }:
{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }:
stdenv.mkDerivation {
name = "pcmanx-gtk2-1.3";
@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302";
};
buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ];
buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ];
preConfigure = ''
./autogen.sh

4
pkgs/applications/networking/cluster/mesos/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
, ethtool, coreutils, which, iptables
@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
makeWrapper autoconf automake115x libtool curl sasl jdk maven
makeWrapper autoconf automake libtool curl sasl jdk maven
python wrapPython boto setuptools leveldb
subversion apr glog openssl libevent
] ++ lib.optionals stdenv.isLinux [

4
pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
View File

@ -3,7 +3,7 @@
, libchamplain, clutter_gtk, geocode_glib
, bash, wrapGAppsHook, itstool, folks, libnotify, libxml2
, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }:
, libsoup, vala_0_32, dbus_glib, automake, autoconf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
libxml2 libsoup gnome3.gnome_online_accounts nspr nss
gdk_pixbuf gnome3.defaultIconTheme librsvg
libchamplain clutter_gtk geocode_glib
vala_0_32 automake115x autoconf db ];
vala_0_32 automake autoconf db ];
preFixup = ''
gappsWrapperArgs+=(