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

make wget build on darwin

Shea Levy c1aefe5d 57d71cf8

Changed files
+5 -2
pkgs
tools
networking
+5 -2
pkgs/tools/networking/wget/default.nix
···
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";