diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-04-13 10:11:42 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-04-13 10:11:42 +0000 |
| commit | d1c19b4049ef21603b5abbbee208320838a67f20 (patch) | |
| tree | 7dde097bbed75996e336e31da6dcf3f21a6fe504 | |
| parent | 689d42ad19d94f899bee9a418dd7c55196dedce0 (diff) | |
| download | nixpkgs-d1c19b4049ef21603b5abbbee208320838a67f20.tar nixpkgs-d1c19b4049ef21603b5abbbee208320838a67f20.tar.gz nixpkgs-d1c19b4049ef21603b5abbbee208320838a67f20.tar.bz2 nixpkgs-d1c19b4049ef21603b5abbbee208320838a67f20.tar.lz nixpkgs-d1c19b4049ef21603b5abbbee208320838a67f20.tar.xz nixpkgs-d1c19b4049ef21603b5abbbee208320838a67f20.tar.zst nixpkgs-d1c19b4049ef21603b5abbbee208320838a67f20.zip | |
GNU wget: Fix test suite runs.
svn path=/nixpkgs/trunk/; revision=21057
| -rw-r--r-- | pkgs/tools/networking/wget/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 1e3171da00b..af15d85af4b 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, perl, gnutls ? null }: +{ stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: stdenv.mkDerivation rec { name = "wget-1.12"; @@ -15,9 +15,16 @@ stdenv.mkDerivation rec { do sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g' 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 ] + ++ stdenv.lib.optional doCheck LWP ++ stdenv.lib.optional (gnutls != null) gnutls; configureFlags = @@ -42,5 +49,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/wget/; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b687b1384ee..70f1ef0e763 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1802,6 +1802,7 @@ let wget = import ../tools/networking/wget { inherit fetchurl stdenv gettext gnutls perl; + inherit (perlPackages) LWP; }; which = import ../tools/system/which { |