From 211f1cae143822e5ae65ded889ed7f0dd2157d48 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Nov 2003 08:44:46 +0000 Subject: [PATCH] * Added GNU wget to the stdenv. svn path=/nixpkgs/trunk/; revision=477 --- pkgs-ng/stdenv/nix/path.fix | 1 + pkgs-ng/system/all-packages-generic.fix | 5 +++++ pkgs-ng/tools/networking/wget/builder.sh | 9 +++++++++ pkgs-ng/tools/networking/wget/default.fix | 10 ++++++++++ 4 files changed, 25 insertions(+) create mode 100755 pkgs-ng/tools/networking/wget/builder.sh create mode 100644 pkgs-ng/tools/networking/wget/default.fix diff --git a/pkgs-ng/stdenv/nix/path.fix b/pkgs-ng/stdenv/nix/path.fix index 883130dfc39..7a801856a7f 100644 --- a/pkgs-ng/stdenv/nix/path.fix +++ b/pkgs-ng/stdenv/nix/path.fix @@ -8,6 +8,7 @@ pkgs.gnutar pkgs.gzip pkgs.bzip2 + pkgs.wget pkgs.binutils pkgs.gnumake pkgs.gcc diff --git a/pkgs-ng/system/all-packages-generic.fix b/pkgs-ng/system/all-packages-generic.fix index 85186e97325..57d416bf82e 100644 --- a/pkgs-ng/system/all-packages-generic.fix +++ b/pkgs-ng/system/all-packages-generic.fix @@ -59,6 +59,11 @@ stdenv = stdenv; }; + wget = (import ../tools/networking/wget) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + ### SHELLS diff --git a/pkgs-ng/tools/networking/wget/builder.sh b/pkgs-ng/tools/networking/wget/builder.sh new file mode 100755 index 00000000000..9523d7e9ca8 --- /dev/null +++ b/pkgs-ng/tools/networking/wget/builder.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd wget-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/tools/networking/wget/default.fix b/pkgs-ng/tools/networking/wget/default.fix new file mode 100644 index 00000000000..259f7dfa62d --- /dev/null +++ b/pkgs-ng/tools/networking/wget/default.fix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: derivation { + name = "wget-1.9"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.nluug.nl/pub/gnu/wget/wget-1.9.tar.gz; + md5 = "18ac093db70801b210152dd69b4ef08a"; + }; + stdenv = stdenv; +}