diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/xinput_calibrator/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/audio/mpdcron/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/audio/pa-applet/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/pixz/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/fuse-7z-ng/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/pgf/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/graphics/povray/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/cunit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/ldapvi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/ldmtool/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/opentsdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/scrub/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/security/crackxls/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/logkeys/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/security/zzuf/default.nix | 3 |
16 files changed, 30 insertions, 29 deletions
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"; |