diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-19 16:53:04 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-19 16:53:04 +0000 |
commit | 5941f66f0e76cadbda30b3240ba00b30ea365ac7 (patch) | |
tree | 35ecc8fde93aa1dd9b5705fe5302cae77ead3860 /pkgs/tools/text/gnused | |
parent | 0fd59fd7a41a47478f241b4a27c39d39f42914b9 (diff) |
* The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g.,
. $stdenv/setup
genericBuild
The generic builder does lots of stuff automatically:
- Unpacks source archives specified by $src or $srcs (it knows about
gzip, bzip2, tar, zip, and unpacked source trees).
- Determines the source tree.
- Applies patches specified by $patches.
- Fixes libtool not to search for libraries in /lib etc.
- Runs `configure'.
- Runs `make'.
- Runs `make install'.
- Strips debug information from static libraries.
- Writes nested log information (in the format accepted by
`log2xml').
There are also lots of hooks and variables to customise the generic
builder. See `stdenv/generic/docs.txt'.
* Adapted the base packages (i.e., the ones used by stdenv) to use the
generic builder.
* We now use `curl' instead of `wget' to download files in `fetchurl'.
* Neither `curl' nor `wget' are part of stdenv. We shouldn't
encourage people to download stuff in builders (impure!).
* Updated some packages.
* `buildinputs' is now `buildInputs' (but the old name also works).
* `findInputs' in the setup script now prevents inputs from being
processed multiple times (which could happen, e.g., if an input was
a propagated input of several other inputs; this caused the size
variables like $PATH to blow up exponentially in the worst case).
* Patched GNU Make to write nested log information in the format
accepted by `log2xml'. Also, prior to writing the build command,
Make now writes a line `building X' to indicate what is being
built. This is unfortunately often obscured by the gigantic tool
invocations in many Makefiles. The actual build commands are marked
`unimportant' so that they don't clutter pages generated by
`log2html'.
svn path=/nixpkgs/trunk/; revision=845
Diffstat (limited to 'pkgs/tools/text/gnused')
-rwxr-xr-x | pkgs/tools/text/gnused/builder.sh | 10 | ||||
-rw-r--r-- | pkgs/tools/text/gnused/default.nix | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/tools/text/gnused/builder.sh b/pkgs/tools/text/gnused/builder.sh index 126635327925..46f69284ae87 100755 --- a/pkgs/tools/text/gnused/builder.sh +++ b/pkgs/tools/text/gnused/builder.sh @@ -1,9 +1,3 @@ #! /bin/sh - -. $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd sed-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 +. $stdenv/setup +genericBuild diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index a92b3996515d..bcca43fcec70 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: + +derivation { name = "gnused-4.0.7"; system = stdenv.system; builder = ./builder.sh; @@ -6,5 +8,5 @@ url = ftp://ftp.nluug.nl/pub/gnu/sed/sed-4.0.7.tar.gz; md5 = "005738e7f97bd77d95b6907156c8202a"; }; - stdenv = stdenv; + inherit stdenv; } |