* 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

pkgs/development/libraries/glibc/default.nix

@@ -7,7 +7,7 @@ derivation {
   system = stdenv.system;
   builder = ./builder.sh;
 
-  glibcSrc = fetchurl {
+  src = fetchurl {
     url = ftp://ftp.nl.net/pub/gnu/glibc/glibc-2.3.2.tar.bz2;
     md5 = "ede969aad568f48083e413384f20753c";
   };
@@ -18,7 +18,8 @@ derivation {
 
   # This is a patch to make glibc compile under GCC 3.3.  Presumably
   # later releases of glibc won't need this.
-  vaargsPatch = ./glibc-2.3.2-sscanf-1.patch;
+  patches = [./glibc-2.3.2-sscanf-1.patch];
 
-  inherit stdenv kernelHeaders patch;
+  buildInputs = [patch];
+  inherit stdenv kernelHeaders;
 }