* More descriptions.

svn path=/nixpkgs/trunk/; revision=6709
2006-10-12 10:53:16 +00:00
parent ccd9579ada
commit 368c196a62
17 changed files with 70 additions and 5 deletions
@@ -111,13 +111,14 @@ rec {
      builder = ./tools/bash;
      args = [ ./scripts/builder-stdenv-initial.sh ];
      inherit system staticTools;
-    }  // {
-      mkDerivation = attrs: derivation ((removeAttrs attrs ["meta"]) // {
+    } // {
+      # !!! too much duplication with stdenv/generic/default.nix
+      mkDerivation = attrs: (derivation ((removeAttrs attrs ["meta"]) // {
        builder = ./tools/bash;
        args = ["-e" attrs.builder];
        stdenv = body;
        system = body.system;
-      });
+      })) // { meta = if attrs ? meta then attrs.meta else {}; };
      shell = ./tools/bash;
    };
  };