public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GNU wget: Fix test suite runs.

Browse Source 
svn path=/nixpkgs/trunk/; revision=21057
This commit is contained in:
Ludovic Courtès 2010-04-13 10:11:42 +00:00
parent 689d42ad19
commit d1c19b4049
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/wget/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gettext, perl, gnutls ? null }: { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wget-1.12"; name = "wget-1.12";
@ -15,9 +15,16 @@ stdenv.mkDerivation rec {
do do
sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g' sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g'
done done
# Work around lack of DNS resolution in chroots.
for i in "tests/"*.pm "tests/"*.px
do
sed -i "$i" -e's/localhost/127.0.0.1/g'
done
''; '';
buildInputs = [ gettext perl ] buildInputs = [ gettext perl ]
++ stdenv.lib.optional doCheck LWP
++ stdenv.lib.optional (gnutls != null) gnutls; ++ stdenv.lib.optional (gnutls != null) gnutls;
configureFlags = configureFlags =
@ -42,5 +49,6 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/wget/; homepage = http://www.gnu.org/software/wget/;
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
}; };
} }

1
pkgs/top-level/all-packages.nix
View File

@ -1802,6 +1802,7 @@ let
wget = import ../tools/networking/wget { wget = import ../tools/networking/wget {
inherit fetchurl stdenv gettext gnutls perl; inherit fetchurl stdenv gettext gnutls perl;
inherit (perlPackages) LWP;
}; };
which = import ../tools/system/which { which = import ../tools/system/which {