diff options
Diffstat (limited to 'pkgs/tools/networking')
23 files changed, 46 insertions, 23 deletions
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 3b7c2926bd49..5a56430c20e9 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr"; }; - buildInputs = [ libpcap openssl zlib libnl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap openssl zlib libnl ]; patchPhase = '' sed -e 's@^prefix.*@prefix = '$out@ -i common.mak diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index fe30a1eab826..766ae4116061 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { configureFlags = "--with-perl=${perl}/bin/perl"; - buildInputs = [ libpcap pkgconfig bison cyrus_sasl tcp_wrappers flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; meta = with stdenv.lib; { description = "Clients for ARGUS"; diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index 673f98e2f3ad..e5c2aace4006 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna"; }; - buildInputs = [ libpcap pkgconfig bison cyrus_sasl tcp_wrappers flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; propagatedBuildInputs = [ procps which wget lsof net_snmp ]; patchPhase = '' diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 22237794f079..24c86f4fa9a6 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; }; - buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which automake autoconf libtool vala_0_23 python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; preConfigure = '' diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix index b5866c2ee130..7c42cc965a00 100644 --- a/pkgs/tools/networking/connmanui/default.nix +++ b/pkgs/tools/networking/connmanui/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0ixx8c9cfdp480z21xfjb7n1x27sf1g8gmgbmcfhr0k888dmziyy"; }; - buildInputs = [ autoconf automake libtool glib gtk3 dbus pkgconfig file intltool connman ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool glib gtk3 dbus file intltool connman ]; preConfigure = '' rm m4/intltool.m4 diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 37226d3dd7b2..3be2b0401bc4 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation rec { name = "davix-0.6.4"; - buildInputs = [ stdenv pkgconfig cmake openssl libxml2 boost ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv cmake openssl libxml2 boost ]; src = fetchFromGitHub { owner = "cern-it-sdc-id"; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 7204ddd5e06f..d8316c66203d 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg"; }; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index b122f532630d..312906f95100 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; - buildInputs = [ gtk2 readline ncurses gettext openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 readline ncurses gettext openssl ]; meta = { description = "GTK+-based FTP client"; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index ea78cdd106ac..fcbf5a4e1b2a 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; }; - buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp_av gnome2.gnome_icon_theme makeWrapper]; postInstall = '' diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index a7d42b773172..cbcaee4de784 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; - buildInputs = [libdnet pkgconfig libpcap]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libdnet libpcap]; meta = { description = ""; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 761dc01d2f98..8b81e0696c23 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1bij6nm06ghkg98n2pdyacam2fyg5y8f7ajw0d5653m0r4ldw5p7"; }; - buildInputs = [ openssl pkgconfig db cyrus_sasl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl db cyrus_sasl ]; meta = with stdenv.lib; { homepage = http://isync.sourceforge.net/; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index ec2f34f56010..19626174ba4c 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; - buildInputs = [ autoconf libpcap ncurses pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf libpcap ncurses glib ]; patches = [ ./no-dns-resolution.patch diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index de7f38314fc6..096a25e9971f 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pkgconfig bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent libcap_ng curl nspr nss python ] ++ optional docs xmlto; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index da36ef727c2d..950a6e310ebd 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg"; }; - buildInputs = [ pkgconfig pcre perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcre perl ]; patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 1f465bc4f8a8..e66209c7ce95 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ protobuf ncurses zlib IOTty makeWrapper perl openssl ]; patches = [ ./ssh_path.patch ]; postPatch = '' diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 3269f92d7f42..255d430a3a5d 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0gjyvn8r66kp49gasd6sqfvg2pj0c6v67hnq7cqwl04kj69rfy86"; }; - buildInputs = [ autoreconfHook pkgconfig ] + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ] ++ optional stdenv.isLinux systemd; meta = { diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 9e7282c40bdd..93646d58cd30 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1sw36w6zkzvabvjckqick032j5p5xi0qi3sgnh0znzxz31jqvf0d"; }; - buildInputs = [ makeWrapper pkgconfig python openldap pam ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper python openldap pam ]; preConfigure = '' substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 3854d94f9093..1927d47582da 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation { sha256 = "1a1l9f6zivfyxg9g2x7kzkvcyh84s7l6v0kimihhrd19zl0m41jn"; }; - buildInputs = [ openssl ppp autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl ppp ]; NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8343f23a1a03..79f203f77470 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -56,7 +56,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; - buildInputs = [ zlib openssl libedit pkgconfig pam ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos ++ optional hpnSupport autoreconfHook; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index d1827a6045d8..0690fe18bdea 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1rvrxgb131snv9r6ksgzmd74rd9z7q46bhky0zazz7dwqqywffcp"; }; - buildInputs = [ pkgconfig libtool autoconf automake cppunit openssl libsigcxx zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libtool autoconf automake cppunit openssl libsigcxx zlib ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 1b537870b09d..5cb65b78ee8b 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "samplicator-${version}"; version = "1.3.8rc1"; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; src = fetchFromGitHub { owner = "sleinen"; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 53465a0242dd..acb5a042ffcc 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ python softhsm openldap p11_kit.dev p11_kit.out gnupg ]; - buildInputs = [ unbound pkgconfig unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unbound unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ] ++ stdenv.lib.optional useSystemd systemd; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 8c443282e5cb..c3abdd49e138 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns"; }; - buildInputs = [ autoreconfHook libcrafter lua ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libcrafter lua ]; configureFlags = [ "--with-lua=yes" ]; |