diff options
81 files changed, 154 insertions, 135 deletions
diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index 91f7175e391ae..f894c856c751a 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -20,13 +20,11 @@ stdenv.mkDerivation rec { sha256 = "0vls94hqpkk8h17da6fddgqbl5dgm6250av3raimhhzwvm5r1gfi"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ alsa-lib audiofile - autoconf - automake gnome2.gtkglext gtk2 libjack2 diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 67c7cd18be8e3..13944c8a01b25 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; }; - buildInputs = [ autoconf automake puredata ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ puredata ]; preBuild = '' export LD=$CXX diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 623714e706fb3..042e6b4307560 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake gtk2 libjack2 + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ gtk2 libjack2 libsndfile ]; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 0802a79df04a8..61d49d110a9e8 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - buildInputs = [ alsa-lib autoconf automake dssi gtk2 libjack2 ladspaH + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH ladspaPlugins liblo pkg-config ]; installPhase = '' diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix index 250379ee71093..a77924bb1f05e 100644 --- a/pkgs/applications/blockchains/cgminer/default.nix +++ b/pkgs/applications/blockchains/cgminer/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ libtool curl ncurses ocl-icd opencl-headers xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ]; configureScript = "./autogen.sh"; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index c769ab4263126..f310fb85a26c6 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; - buildInputs = [ wxGTK autoconf automake libtool python2 gettext ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ wxGTK libtool python2 gettext ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index 7068954baac89..c751f4c28026a 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf gtk3 ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ gtk3 ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 484b9d3b4073b..dffbd2079aead 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libXft intltool automake autoconf libtool ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ gtk2 libXft intltool libtool ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 14464247659cf..00b970cd68716 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ bitlbee autoconf automake libtool libgcrypt ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ bitlbee libtool libgcrypt ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index a7b57aa31028b..c144b4bf58531 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w"; }; - buildInputs = [ bison flex autoconf automake openssl ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ bison flex openssl ]; # includes an important security patch patches = [ diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index a3ee4e4ab9c7d..c275f904660b6 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { cp src/.libs/libfish.so $out/lib/irssi/modules ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gmp automake autoconf libtool openssl glib ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ gmp libtool openssl glib ]; meta = { homepage = "https://github.com/falsovsky/FiSH-irssi"; diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index c357e78ccf293..785fa6886a86a 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { pname = "owamp"; version = "3.5.6"; - buildInputs = [ autoconf automake mandoc ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ mandoc ]; src = fetchFromGitHub { owner = "perfsonar"; repo = "owamp"; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index cb48a790b543c..f0fd7ff530fc0 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -38,9 +38,9 @@ in stdenv.mkDerivation rec { "--with-boost-libdir=${boostPython.out}/lib" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; buildInputs = [ - autoconf automake libtool python2 + libtool python2 boostPython db openssl geoip miniupnpc libiconv ]; diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index b6d0d373f35bd..d7b1984b0d733 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz"; sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake clutter clutter-gst gdk-pixbuf + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ clutter clutter-gst gdk-pixbuf cairo clutter-gtk ]; meta = with lib; { diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix index bcf47e6b6a3d1..2da7f627cb404 100644 --- a/pkgs/applications/science/biology/kssd/default.nix +++ b/pkgs/applications/science/biology/kssd/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-8jzYqo9LXF66pQ1EIusm+gba2VbTYpJz2K3NVlA3QxY="; }; - buildInputs = [ zlib automake autoconf libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ zlib libtool ]; installPhase = '' install -vD kssd $out/bin/kssd diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index 94a8f081f69ab..a16d5f32e27ab 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ gettext libtool automake autoconf cairo gtk2 ]; + nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ]; + buildInputs = [ gettext libtool cairo gtk2 ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix index 7ad040a7c17ef..0ba747d72350c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { rev = "531bb33"; sha256 = "1sv7s2ykc840cjwbfn7ayy743643x9i1lvk4cd55w9l052xvzj65"; }; - buildInputs = [ autoconf automake libtool gmp ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool gmp ]; preConfigure = "./autogen.sh"; meta = { diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 9ac49167f66b4..a1bdef2639a87 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -21,10 +21,9 @@ stdenv.mkDerivation rec { ./autogen.sh ''; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf - automake libtool intltool ]; diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index ace8a3d2de398..11a2904f60867 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { sha256 = "sha256-phKCghCeM+/QlxjIxfNQySo+5XMRqfOqlS9kgp07YKc="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ gmp which flex bison autoconf automake libtool jdk perl ]; + nativeBuildInputs = [ makeWrapper autoconf automake ]; + buildInputs = [ gmp which flex bison libtool jdk perl ]; preConfigure = '' cd aldor ; diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 55a35176e7bba..c7dc561e7b6c3 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -16,9 +16,10 @@ stdenv.mkDerivation { sha256 = "0mgc6llbq166jmlq3alvagqsg3730670zvbwwkdgsqklw70v9355"; }; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ stdenv gcc glibc - libtool gnumake autoconf automake + libtool gnumake file which zsh m4 gtk2 zlib gmp gnome2.libgnomecanvas pango sqlite libxml2 pkg-config perl smlnj diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index 9af1eccc7935a..513e4ec3eec64 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -25,10 +25,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k="; }; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libtool - autoconf - automake makeWrapper ]; propagatedBuildInputs = [ diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 20a33307bf3c1..0d731e38d8392 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-dgTEM2aL8lVjVMuW0+HLc+TUA39IiuBv/RfHYNURh5s="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mono dotnetbuildhelpers autoconf automake which ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ mono dotnetbuildhelpers which ]; configurePhase = '' sed -i '988d' src/FSharpSource.targets diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index ea1af60993f9d..320cbdc41b0f0 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -51,7 +51,8 @@ clangStdenv.mkDerivation rec { and run this installation again. ''; }; - buildInputs = [ git xz gnutar openssl automake autoconf libtool clang ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ git xz gnutar openssl libtool clang ]; alt_wrapper = ./alt_wrapper.c; builder = ./9.2_builder.sh; meta = { diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index e48bbc90d61ff..030c30b96a5a3 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2"; }; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf automake readline libX11 SDL2 bluez + readline libX11 SDL2 bluez ]; preConfigure = "cd src;autoconf"; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 2719008bbd9eb..5e97e4f003e2f 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-C/Ifd0KjmaM5Y2fxBiDNz1GQoT4GeH/vyUCiira57U4="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 - libvorbis libogg libtheora autoconf which libtool automake + libvorbis libogg libtheora which libtool ]; preConfigure = "$shell ./platform/unix/automagic"; diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix index 83095ac0924ec..bb8f88379fad8 100644 --- a/pkgs/development/interpreters/love/11.nix +++ b/pkgs/development/interpreters/love/11.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { sha256 = "0kpdp6v8m8j0r7ppyy067shr0lfgrlh0dwb7ccws76d389vizwhb"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 - libvorbis libogg libtheora autoconf which libtool automake + libvorbis libogg libtheora which libtool ]; preConfigure = "$shell ./platform/unix/automagic"; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index ca7ea10afffa9..4f7891910a7d3 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j"; }; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM - libsamplerate libtool autoconf automake xorgproto libICE pkg-config + libsamplerate libtool xorgproto libICE pkg-config ]; meta = with lib; { diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 9c7f4893cbe4a..e4a169ef8ba93 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-2LyBdJR0dV1CElcGfrlmNwX52lVtx9X/Z4h/1XFjOIs="; }; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool ]; preConfigure = '' sh autogen.sh diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index a9b6325c3d71e..7ca154f18e069 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { url = "https://forge.imag.fr/frs/download.php/370/givaro-${version}.tar.gz"; sha256 = "0lf5cnbyr27fw7klc3zabkb1979dn67jmrjz6pa3jzw2ng74x9b3"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [autoconf automake libtool gmpxx]; + nativeBuildInputs = [ autoreconfHook autoconf automake ]; + buildInputs = [libtool gmpxx]; meta = { description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index 1bfe7682ffa71..f52f23d15c12b 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { url = "https://forge.imag.fr/frs/download.php/592/givaro-${version}.tar.gz"; sha256 = "1822ksv8653a84hvcz0vxl3nk8dqz7d41ys8rplq0zjjmvb2i5yq"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [autoconf automake libtool gmpxx]; + nativeBuildInputs = [ autoreconfHook autoconf automake ]; + buildInputs = [libtool gmpxx]; meta = { description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 83f7854a73b0b..5f9f49f239d90 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [autoconf automake libtool]; + nativeBuildInputs = [ autoreconfHook autoconf automake ]; + buildInputs = [libtool]; propagatedBuildInputs = [ gmpxx ]; configureFlags = [ diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index debf3eb592644..5992868c7343a 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake glib libtool ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ glib libtool ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix index 91053828b586f..0948b5d01fac0 100644 --- a/pkgs/development/libraries/gumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0xslckwdh2i0g2qjsb6rnm8mjmbagvziz0hjlf7d1lbljfms1iw1"; }; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 95eb0ce4de0a1..ee1b4fb8ce8a8 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -15,9 +15,9 @@ in stdenv.mkDerivation rec { sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ - autoconf automake libtool gnome.gnome-common gtk-doc gtk2 + libtool gnome.gnome-common gtk-doc gtk2 python pygtk lua gobject-introspection ]; diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 130fc60a12c90..b21d0f1159e08 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frog-v${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtar libtool autoconf-archive libxml2 icu languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 61134a8ebfb3b..f037e7fc17a09 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frogdata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ libtool autoconf-archive ]; preConfigure = '' diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 3137d86468339..c2b4f6662bb50 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 49fc3c850ae8a..af0f872494231 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index 53bbd131bfaf4..a5b262106c055 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ticcutils-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool autoconf-archive libxml2 + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ libtool autoconf-archive libxml2 # optional: zlib bzip2 libtar # broken but optional: boost diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index 9ca0b080a21d0..8b9e6c62aee2d 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils ]; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index 42bc5edb43f7d..55e914bd5b445 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index 429858256068d..4d85bbfc212bf 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf bzip2 libtool autoconf-archive + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ bzip2 libtool autoconf-archive icu libtar libxml2 languageMachines.ticcutils languageMachines.libfolia diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 7f8d4889c62e8..dbc15a17a14b6 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "uctodata-${release.version}.tar.gz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool autoconf-archive ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; + buildInputs = [ libtool autoconf-archive ]; preConfigure = "sh bootstrap.sh"; meta = with lib; { diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index e5503169fd5f5..30c1477755345 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; + nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ]; + buildInputs = [ glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' ./configure --with-pkg-config=$PKG_CONFIG_PATH \ diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 8761ac1e5ef82..e9f117577e497 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = []; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool ]; preConfigure = '' sh autogen.sh diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 73277d30de3cb..5b68a6526f1d1 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ automake autoconf libtool m4 sqlite ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ libtool m4 sqlite ]; configureScript = "./autogen.sh"; diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index 22543972c1e6c..029bec5630bf4 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-libpcap=yes" ]; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool ]; propagatedBuildInputs = [ libpcap ]; diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 6455bf03b5aea..717d565ef8353 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "09mhbr8x66ykhf5581a5zjpplpjxibqzgkkpx689kybwg0wk1cw3"; }; - buildInputs = [ automake autoconf libtool ]; + nativeBuildInputs = [ automake autoconf ]; + buildInputs = [ libtool ]; # .so endings are missing (quick and dirty fix) postInstall = '' diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 683c21095e6bd..be4cdd62f6e1b 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config automake autoconf ]; buildInputs = [ - automake autoconf libtool + libtool intltool gobject-introspection glib gtk2 gtk-doc clutter clutter-gtk diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index 697616f01f30f..d40b5b6b04921 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; - buildInputs = [ automake autoconf xlibsWrapper ]; + nativeBuildInputs = [ automake autoconf ]; + buildInputs = [ xlibsWrapper ]; # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # Also, modern automake doesn't like things and returns error code 63. But it generates the file. diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index bbcefa0a44336..1d726ed7b192f 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ autoconf automake libtool glib readline ]; + nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ]; + buildInputs = [ glib readline ]; preConfigure = '' substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index f296f59d408bc..92796b4116c48 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf - automake gnum4 gperf libtool diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index f5fb8e8eeb1af..b20d172a403dc 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -17,8 +17,8 @@ let sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [popt avahi pkg-config python3 gtk3 autoconf automake which procps libiberty_static]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [popt avahi pkg-config python3 gtk3 which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 1ae54d629acc8..f9d7a8156e14e 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { inherit stdenv src version patches; buildInputs = - [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx_6 + [ makeWrapper libtool unzip nukeReferences sqlite libpqxx_6 top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt perlDeps perl nix postgresql # for running the tests @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { gzip bzip2 xz gnutar unzip git top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - nativeBuildInputs = [ autoreconfHook pkg-config mdbook ]; + nativeBuildInputs = [ autoreconfHook pkg-config mdbook autoconf automake ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index d38d8936c1a9e..9e842acfa9a50 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { pname = "garden-of-coloured-lights"; version = "1.0.9"; - buildInputs = [ allegro autoconf automake ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ allegro ]; prePatch = '' noInline='s/inline //' diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index 0acabb4a55f31..f135c93ff04fa 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4"; }; - buildInputs = [ libGLU libGL SDL freeglut SDL_mixer autoconf automake libtool ]; + nativeBuildInputs = [ automake autoconf ]; + buildInputs = [ libGLU libGL SDL freeglut SDL_mixer libtool ]; meta = with lib; { description = "An air combat simulator"; diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index 3fadd73ce18e5..244a826cb1656 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { --replace "sudo " "" ''; - buildInputs = [ perl autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ perl libtool ]; makeFlags = [ "prefix=$(out)" "tgz" ]; diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index e8daa9a202516..7548b082a13ba 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j"; }; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - ncurses flex bison autoconf automake m4 + ncurses flex bison m4 ]; preConfigure = '' diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index e5de7c116c7ee..40a1414cfab39 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation { sha256 = "0w121issdjxdv5i9ksa5m23if6pz1r9ql8p894f1pqn16w0kw1ix"; }; + nativeBuildInputs = [ automake autoconf ]; buildInputs = [ - cups automake autoconf glib libxml2 libusb1 libtool + cups glib libxml2 libusb1 libtool ]; # lgmon3's --enable-libdir flag is used soley for specifying in which diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index 2cb3fe01ddb60..d5ccc857e8d4a 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation { sha256 = "06s9nl155yxmx56056y22kz1p5b2sb5fhr3gf4ddlczjkd1xch53"; }; - buildInputs = [ autoconf libtool automake + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool cups popt libtiff libpng ghostscript ]; diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 1f0f7ab6e91d1..2bd79691461cc 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -30,7 +30,8 @@ in stdenv.mkDerivation { sha256 = "1f6vpx1z3qa88590i5m0s49j9n90vpk81xmw6pvj0nfd3qbvzkya"; }; - buildInputs = [ autoconf libtool automake + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool cups popt libtiff libpng ghostscript glib libusb1 libxml2 ]; diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix index 12e7f798e79e3..00e97855e2617 100644 --- a/pkgs/os-specific/linux/conspy/default.nix +++ b/pkgs/os-specific/linux/conspy/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { curlOpts = " -A application/octet-stream "; }; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf - automake ncurses ]; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 8763591d05e39..cc6e8c116eed9 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0alfa8hz09jdg29bi1mvhwyr2nl0nvss2a2kybrcjvdw1fx6vijn"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; + nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ]; + buildInputs = [ apacheHttpd curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"]; diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index 090450ba9688c..77272694a89d8 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07r6nwbg4881mdgp0hqh80c4x9wb7jg6cgc84ghwhfbd2abc2iq5"; }; - buildInputs = [ automake autoconf ]; + nativeBuildInputs = [ automake autoconf ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 2e5a4eca2910e..6911166b0e40d 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --with-gui=X11"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ xorgproto libXi libtool m4 xlibsWrapper ]; meta = { homepage = "https://github.com/tias/xinput_calibrator"; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index afb1c9a3dcdae..94ba5a56d032b 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -31,9 +31,8 @@ in stdenv.mkDerivation { sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw"; }; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf - automake libtool pkg-config glib diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 6454a14b4265b..3f417978f97b0 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation { sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ - gtk3 libpulseaudio glibc automake autoconf libnotify libX11 xf86inputevdev + gtk3 libpulseaudio glibc libnotify libX11 xf86inputevdev ]; preConfigure = '' diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index ec05a44a51892..a8463f8abc4eb 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -18,10 +18,8 @@ stdenv.mkDerivation rec { pname = "pixz"; version = "1.0.7"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; buildInputs = [ - autoconf - automake libtool asciidoc libxslt diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index 0149071ab0d0c..0367ed6037e25 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x"; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ fuse autoconf automake ]; + nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ]; + buildInputs = [ fuse ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 3c1e0c50d6145..e25c50e09503e 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,7 +15,7 @@ let buildInputs = [ fuse bison flex openssl ncurses readline - autoconf automake libtool pkg-config zlib libaio libxml2 + libtool pkg-config zlib libaio libxml2 acl sqlite liburcu attr makeWrapper util-linux libtirpc gperftools liburing (python3.withPackages (pkgs: [ @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" ]; - nativeBuildInputs = [ rpcsvc-proto ]; + nativeBuildInputs = [ rpcsvc-proto autoconf automake ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index 8976700006bc6..7cac5a8e21bda 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1vfm12cfq3an3xg0679bcwdmjq2x1bbij1iwsmm60hwmrm3zvab0"; }; - buildInputs = [ autoconf automake libtool dos2unix libpgf freeimage doxygen ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool dos2unix libpgf freeimage doxygen ]; patchPhase = '' sed 1i'#include <inttypes.h>' -i src/PGF.cpp diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 735bba8bd4f44..537e5d0a6db02 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0hy5a3q5092szk2x3s9lpn1zkszgq9bp15rxzdncxlvnanyzsasf"; }; - - buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff xlibsWrapper SDL ]; + nativeBuildInputs = [ automake autoconf ]; + buildInputs = [ boost zlib libpng libjpeg libtiff xlibsWrapper SDL ]; # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 0322f3b708f13..e287306dfb940 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "CUnit"; version = "2.1-3"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [autoconf automake libtool]; + nativeBuildInputs = [ autoreconfHook autoconf automake ]; + buildInputs = [libtool]; src = fetchurl { url = "mirror://sourceforge/cunit/CUnit/${version}/${pname}-${version}.tar.bz2"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 759e86080903b..f8862cfa56774 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl autoconf automake ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl ]; preConfigure = '' cd ldapvi diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index a826f3a0de542..9635f8e1a8cce 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ gtk-doc lvm2 libxslt.bin libtool readline gobject-introspection json-glib libuuid ]; diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index bffcd5e1dca4b..18ba5f4b5fc5f 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ autoconf automake curl jdk nettools python2 git ]; + nativeBuildInputs = [ makeWrapper autoconf automake ]; + buildInputs = [ curl jdk nettools python2 git ]; preConfigure = '' patchShebangs ./build-aux/ diff --git a/pkgs/tools/misc/scrub/default.nix b/pkgs/tools/misc/scrub/default.nix index baa3732b58406..f3a1ae619305c 100644 --- a/pkgs/tools/misc/scrub/default.nix +++ b/pkgs/tools/misc/scrub/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0ndcri2ddzqlsxvy1b607ajyd4dxpiagzx331yyi7hf3ijph129f"; }; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index 748bfdcb2cad3..456ea0890cac6 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake openssl libgsf gmp ]; + nativeBuildInputs = [ pkg-config autoconf automake ]; + buildInputs = [ openssl libgsf gmp ]; installPhase = '' diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index 7cd6b5fd194b9..a0c6e0a5f6286 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1k6kj0913imwh53lh6hrhqmrpygqg2h462raafjsn7gbd3vkgx8n"; }; - buildInputs = [ autoconf automake which procps kbd ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ which procps kbd ]; postPatch = '' substituteInPlace src/Makefile.am --replace 'root' '$(id -u)' diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index f8f7bece3a598..5b30d5270df91 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9"; }; - buildInputs = [ autoconf automake libtool pkg-config ]; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool pkg-config ]; preConfigure = "./bootstrap"; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index bc91b9e26a4f2..d15db2b1d3882 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -83,8 +83,8 @@ rec { pname = "xmlmirror"; version = "unstable-2016-06-05"; - buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkg-config zlib ]; + buildInputs = [ pkg-config libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkg-config zlib autoconf automake ]; src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; |