diff options
Diffstat (limited to 'pkgs/development')
36 files changed, 70 insertions, 62 deletions
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" ]; |