Adding a new special attribute for mkDerivation: crossAttrs. It sits next to

"meta" and "passthru", and these attributes will be appended to the usual
mkDerivation attributes only if the package is cross built.
This allows putting some of the cross-building logic in the mkDerivation
nix parameters, and not only in the final builder script, as it was until now.

svn path=/nixpkgs/trunk/; revision=20272

2 files changed, 2 insertions, 2 deletions

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 33e1f8505d27..f1babf2dfb28 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -170,7 +170,7 @@ rec {
                     propagatedBuildNativeInputs = propagatedBuildNativeInputsDrvs;
 
                     crossConfig = cross.config;
-                });
+                } // (if args ? crossAttrs then args.crossAttrs else {}));
         in buildDrv // {
             inherit hostDrv buildDrv;
         };
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 191dd54c6aea..fa9c18b2c374 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -44,7 +44,7 @@ let
         # stdenv and its shell.
         mkDerivation = attrs:
           (derivation (
-            (removeAttrs attrs ["meta" "passthru"])
+            (removeAttrs attrs ["meta" "passthru" "crossAttrs"])
             // (let
                 buildInputs = if attrs ? buildInputs then attrs.buildInputs
                     else [];