Merge branch 'master' of git://github.com/gridaphobe/nixpkgs

make wget build on darwin
This commit is contained in:
Shea Levy 2015-02-04 16:41:15 +00:00
commit c1aefe5d7e

View file

@ -21,19 +21,22 @@ stdenv.mkDerivation rec {
do
sed -i "$i" -e's/localhost/127.0.0.1/g'
done
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export LIBS="-liconv -lintl"
'';
nativeBuildInputs = [ gettext ];
buildInputs = [ libidn ]
++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ]
++ stdenv.lib.optional (gnutls != null) gnutls;
++ stdenv.lib.optional (gnutls != null) gnutls
++ stdenv.lib.optional stdenv.isDarwin perl;
configureFlags =
if gnutls != null
then "--with-ssl=gnutls"
else "--without-ssl";
doCheck = (perl != null && python3 != null);
doCheck = (perl != null && python3 != null && !stdenv.isDarwin);
meta = with stdenv.lib; {
description = "Tool for retrieving files using HTTP, HTTPS, and FTP";