diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/networking/dhcp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/nbd/default.nix | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 0fea977cd0585..33f11cdede578 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -7,22 +7,23 @@ assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; +assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { name = "curl-7.21.0"; - + src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy"; }; - + # Zlib and OpenSSL must be propagated because `libcurl.la' contains # "-lz -lssl", which aren't necessary direct build inputs of # applications that use Curl. propagatedBuildInputs = stdenv.lib.optional zlibSupport zlib ++ stdenv.lib.optional sslSupport openssl; - + configureFlags = '' ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"} ${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"} @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { ''; dontDisableStatic = if linkStatic then true else false; - + CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else ""; LDFLAGS = if linkStatic then "-static" else ""; CXX = "g++"; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 49a2de6e08f95..67997c700e997 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper }: +{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper, coreutils, gnused }: stdenv.mkDerivation rec { name = "dhcp-4.1.1-P1"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/sbin/dhclient-script \ --replace /sbin/ip ${iproute}/sbin/ip wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \ - "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${stdenv.coreutils}/bin:${stdenv.gnused}/bin" + "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin" ''; preConfigure = diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index e55126a287799..2a634f9a2dc54 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, glib}: stdenv.mkDerivation rec { - name = "nbd-2.9.16"; + name = "nbd-2.9.17"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "1dcd5c5bc478497f0aa6f21f6f04d6cadc3f2e39d45d0e2705a9a1c1c8e91dc9"; + sha256 = "07423fba4b1a6d394008505b86fe41d1978956035f49c1197de648fbaa7fb7ff"; }; buildInputs = [pkgconfig glib]; |