From 98b2d7b727491f18e2f3e0bba17611e95e6e8016 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2015 19:36:06 +0200 Subject: [PATCH] Separate nativeBuildInputs where maintainers |= nckx --- pkgs/applications/editors/neovim/default.nix | 11 ++++++----- pkgs/applications/graphics/apitrace/default.nix | 3 ++- pkgs/applications/graphics/simple-scan/default.nix | 5 +++-- .../networking/remote/x2goclient/default.nix | 3 ++- pkgs/development/compilers/squeak/default.nix | 5 +++-- pkgs/development/libraries/bobcat/default.nix | 4 ++-- .../libraries/libnetfilter_conntrack/default.nix | 3 ++- pkgs/development/libraries/libpsl/default.nix | 3 ++- pkgs/development/libraries/libxcomp/default.nix | 3 ++- pkgs/development/tools/analysis/coan/default.nix | 2 +- pkgs/development/tools/parsing/flexc++/default.nix | 3 ++- pkgs/games/eduke32/default.nix | 3 ++- pkgs/misc/drivers/hplip/default.nix | 4 +++- pkgs/os-specific/linux/radeontop/default.nix | 3 ++- pkgs/servers/nosql/cassandra/2.0.nix | 2 +- pkgs/servers/nosql/cassandra/2.1.nix | 2 +- pkgs/tools/admin/nxproxy/default.nix | 3 ++- pkgs/tools/compression/xdelta/default.nix | 2 +- pkgs/tools/filesystems/boxfs/default.nix | 3 ++- pkgs/tools/filesystems/duff/default.nix | 2 +- pkgs/tools/filesystems/encfs/default.nix | 3 ++- pkgs/tools/filesystems/exfat-utils/default.nix | 2 +- pkgs/tools/filesystems/fuse-exfat/default.nix | 3 ++- pkgs/tools/filesystems/mp3fs/default.nix | 3 ++- pkgs/tools/misc/gparted/default.nix | 5 ++--- pkgs/tools/networking/httping/default.nix | 3 ++- pkgs/tools/networking/ipv6calc/default.nix | 3 ++- pkgs/tools/package-management/dpkg/default.nix | 3 ++- pkgs/tools/security/eid-mw/default.nix | 3 ++- pkgs/tools/security/eid-viewer/default.nix | 3 ++- 30 files changed, 61 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 3943a9910a4d..28d455e06b26 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -27,7 +27,8 @@ let owner = "neovim"; }; - buildInputs = [ libtool perl ]; + buildInputs = [ perl ]; + nativeBuildInputs = [ libtool ]; makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; @@ -66,8 +67,6 @@ let enableParallelBuilding = true; buildInputs = [ - makeWrapper - cmake glib libtermkey libuv @@ -79,12 +78,14 @@ let libmsgpack ncurses neovimLibvterm - pkgconfig unibilium ] ++ optional withJemalloc jemalloc; nativeBuildInputs = [ + cmake gettext + makeWrapper + pkgconfig ]; LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; @@ -136,7 +137,7 @@ let in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec { name = "neovim-${version}-configured"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin for item in ${neovim}/bin/*; do diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 348ba5c3c2c7..8e546652f852 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { owner = "apitrace"; }; - buildInputs = [ cmake python libX11 qt4 ]; + buildInputs = [ python libX11 qt4 ]; + nativeBuildInputs = [ cmake ]; buildPhase = '' cmake diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index ad825eceec2b..b96688333a22 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2 makeWrapper - pkgconfig saneBackends systemd vala ]; + buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2 + saneBackends systemd vala ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 328a156260b0..4353f2510385 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ cups libssh libXpm nxproxy openldap makeWrapper qt4 ]; + buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ]; + nativeBuildInputs [ makeWrapper ]; patchPhase = '' substituteInPlace Makefile \ diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 816803d4bd99..6e68defb6248 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs - pango pkgconfig libpulseaudio which ]; + buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs + pango libpulseaudio which ]; + nativeBuildInputs = [ cmake pkgconfig ]; postPatch = '' for i in squeak.in squeak.sh.in; do diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index abd8a284e62f..791dab2d17aa 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ gcc49 icmake libmilter libX11 openssl readline utillinux - yodl ]; + buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ]; + nativeBuildInputs = [ icmake yodl ]; postPatch = '' substituteInPlace INSTALL.im --replace /usr $out diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index a1a343de0e22..0e10161a75a0 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r"; }; - buildInputs = [ pkgconfig libmnl ]; + buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { description = "Userspace library providing an API to the in-kernel connection tracking state table"; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 4a2d7be7b8bb..c304b9e6930f 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ autoreconfHook icu libxslt pkgconfig ]; + buildInputs = [ icu libxslt ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = "--disable-static --enable-man"; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 3a7ca70a85ff..ed9e4b269446 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ]; + buildInputs = [ libjpeg libpng12 libX11 zlib ]; + nativeBuildInputs = [ autoreconfHook ]; preAutoreconf = '' cd nxcomp/ diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index ce9b8a9a59d6..dd550064e263 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44"; }; - buildInputs = [ perl ]; + nativeBuildInputs = [ perl ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 0a7e25305260..515fb9d251f2 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ bobcat gcc49 icmake yodl ]; + buildInputs = [ bobcat gcc49 ]; + nativeBuildInputs = [ icmake yodl ]; postPatch = '' substituteInPlace INSTALL.im --replace /usr $out diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 46cd66d22af0..e0c5798d48d6 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -13,8 +13,9 @@ in stdenv.mkDerivation rec { sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; }; - buildInputs = [ flac gtk libvorbis libvpx mesa pkgconfig SDL2 SDL2_mixer ] + buildInputs = [ flac gtk libvorbis libvpx mesa SDL2 SDL2_mixer ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; + nativeBuildInputs = [ pkgconfig ]; postPatch = '' substituteInPlace build/src/glbuild.c \ diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 09fa67d7dcd1..ba64b729393f 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -139,9 +139,11 @@ stdenv.mkDerivation { pythonPackages.wrapPython saneBackends dbus - pkgconfig net_snmp ] ++ stdenv.lib.optional qtSupport qt4; + nativeBuildInputs = [ + pkgconfig + ]; pythonPath = with pythonPackages; [ dbus diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index 99100b85cb6e..05442abc5e80 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { owner = "clbr"; }; - buildInputs = [ pkgconfig gettext ncurses libdrm libpciaccess ]; + buildInputs = [ ncurses libdrm libpciaccess ]; + nativeBuildInputs = [ pkgconfig gettext ]; enableParallelBuilding = true; diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index a0392d0f95ab..4f27452a0653 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir $out diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 5d99af41cb21..94f920ffe11d 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir $out diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index e9fe8f8f9c7d..20b8f4059ad8 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { ./0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch ]; - buildInputs = [ autoreconfHook libxcomp ]; + buildInputs = [ libxcomp ]; + nativeBuildInputs = [ autoreconfHook ]; preAutoreconf = '' cd nxproxy/ diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index 5355138ac8c4..68c4ea809bed 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "jmacd"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; postPatch = '' cd xdelta3 diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 69c2d046f1c1..e82e720c11bd 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -34,7 +34,8 @@ in stdenv.mkDerivation { patches = [ ./work-around-API-borkage.patch ]; - buildInputs = [ curl fuse libxml2 pkgconfig ]; + buildInputs = [ curl fuse libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; buildFlags = "static"; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 59cb07dead0f..edb69aaef5cf 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "elmindreda"; }; - buildInputs = [ autoreconfHook gettext ]; + nativeBuildInputs = [ autoreconfHook gettext ]; preAutoreconf = '' # duff is currently badly packaged, requiring us to do extra work here that diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 211690606efe..d85440c5475e 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { owner = "vgough"; }; - buildInputs = [ autoreconfHook boost fuse openssl perl pkgconfig rlog ]; + buildInputs = [ boost fuse openssl rlog ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; configureFlags = [ "--with-boost-serialization=boost_wserialization" diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix index 3215b0d9174d..eb7977c71a3b 100644 --- a/pkgs/tools/filesystems/exfat-utils/default.nix +++ b/pkgs/tools/filesystems/exfat-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ scons ]; + nativeBuildInputs = [ scons ]; buildPhase = '' export CCFLAGS="-std=c99" diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix index ae9f9e32fa88..ef8bf5845dd6 100644 --- a/pkgs/tools/filesystems/fuse-exfat/default.nix +++ b/pkgs/tools/filesystems/fuse-exfat/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { name = "${name}.tar.gz"; }; - buildInputs = [ pkgconfig fuse scons ]; + buildInputs = [ fuse ]; + nativeBuildInputs = [ pkgconfig scons ]; buildPhase = '' export CCFLAGS="-O2 -Wall -std=c99 -I${fuse}/include" diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 23ee5558e146..8859aa003ebf 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-statfs-operation.patch ]; - buildInputs = [ flac fuse lame libid3tag pkgconfig ]; + buildInputs = [ flac fuse lame libid3tag ]; + nativeBuildInputs = [ pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 464e40ec0144..847090101184 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -12,9 +12,8 @@ stdenv.mkDerivation rec { configureFlags = "--disable-doc"; - buildInputs = [ - parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 hicolor_icon_theme - ]; + buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ]; + nativeBuildInputs = [ intltool gettext pkgconfig ]; meta = with stdenv.lib; { description = "Graphical disk partitioning tool"; diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 9243550a1b1b..9389d17900b1 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs"; }; - buildInputs = [ gettext ncurses ]; + buildInputs = [ ncurses ]; + nativeBuildInputs = [ gettext ]; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index f1abec0faf71..102d06882349 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3"; }; - buildInputs = [ geoip geolite-legacy getopt openssl perl ]; + buildInputs = [ geoip geolite-legacy getopt openssl ]; + nativeBuildInputs = [ perl ]; patchPhase = '' for i in {,databases/}lib/Makefile.in; do diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index e5be41ed7f6f..dbe1e665411d 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation { done ''; - buildInputs = [ perl zlib bzip2 xz makeWrapper ]; + buildInputs = [ perl zlib bzip2 xz ]; + nativeBuildInputs [ makeWrapper ]; postInstall = '' diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 1833d460081f..e02c58d3825b 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { owner = "Fedict"; }; - buildInputs = [ autoreconfHook gtk2 pcsclite pkgconfig ]; + buildInputs = [ gtk2 pcsclite ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix index 06307263e52e..f2dfd58a7fb1 100644 --- a/pkgs/tools/security/eid-viewer/default.nix +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "e263e6751ef7c185e278a607fdc46c207306d9a56c6ddb2ce6f58fb4464a2893"; }; - buildInputs = [ jre makeWrapper pcsclite ]; + buildInputs = [ jre pcsclite ]; + nativeBuildInputs = [ makeWrapper ]; unpackPhase = "tar -xzf ${src} --strip-components=1";