From 0093d96841e1c7f605e04b09082284a8a98ac538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 16 Nov 2011 14:48:27 +0000 Subject: [PATCH] GNU Wget: Prepare for cross-compilation of a stripped-down version. svn path=/nixpkgs/trunk/; revision=30445 --- pkgs/tools/networking/wget/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index afd741f2735..799c5e9dd85 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1kadjg63x1mm741dxdidwsn1rz0f7dkzbq59v0iww87jr45p3ir4"; }; - preConfigure = + preConfigure = stdenv.lib.optionalString doCheck '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" do sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g' @@ -21,16 +21,17 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ gettext perl ] - ++ stdenv.lib.optional doCheck LWP + buildNativeInputs = [ gettext ]; + buildInputs = + stdenv.lib.optionals doCheck [ perl LWP ] ++ stdenv.lib.optional (gnutls != null) gnutls; configureFlags = if gnutls != null then "--with-ssl=gnutls" - else ""; + else "--without-ssl"; - doCheck = true; + doCheck = (perl != null); meta = { description = "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP";