From f0ce6cfe94bb417ebba7b159220c5943b5e7a828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 17 Mar 2010 09:05:11 +0000
Subject: [PATCH] Trying to remove evaluation errors in hydra nixpkgs for the
 cross compiler related derivations. I remove their 'meta platforms'
 attribute, defined in the gcc expression, so hydra does not attempt to build
 them in the nixpkgs evaluation.

svn path=/nixpkgs/trunk/; revision=20678
---
 pkgs/top-level/all-packages.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 811f04fc105e..a75aeb7b391c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1974,19 +1974,20 @@ let
     cross = assert crossSystem != null; crossSystem;
   };
 
-  gcc44_realCross = makeOverridable (import ../development/compilers/gcc-4.4) {
-    inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs
-        gettext which;
-    binutilsCross = binutilsCross;
-    libcCross = libcCross;
-    profiledCompiler = false;
-    enableMultilib = false;
-    # cross-building for ultrasparc in 4.4.3 will require disabling shared due to a gcc bug.
-    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818
-    enableShared = if (crossSystem.arch == "sparc64") then false else true;
-    crossStageStatic = false;
-    cross = assert crossSystem != null; crossSystem;
-  };
+  gcc44_realCross = lib.addMetaAttrs { platforms = []; } (
+    makeOverridable (import ../development/compilers/gcc-4.4) {
+      inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs
+          gettext which;
+      binutilsCross = binutilsCross;
+      libcCross = libcCross;
+      profiledCompiler = false;
+      enableMultilib = false;
+      # cross-building for ultrasparc in 4.4.3 will require disabling shared due to a gcc bug.
+      # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818
+      enableShared = if (crossSystem.arch == "sparc64") then false else true;
+      crossStageStatic = false;
+      cross = assert crossSystem != null; crossSystem;
+    });
 
   gccCrossStageStatic = wrapGCCCross {
     gcc = forceBuildDrv (gcc44_realCross.override {