From f1713f192d1ea769e6ec52b0180e582973d7c5cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Feb 2010 13:35:38 +0000
Subject: [PATCH] * Fix the VM builds.  They were broken because a `hostDrv'
 and   `buildDrv' attribute gets added to every derivation in  
 `makeStdenvCross'.  So filter out those attributes.  But the real   question
 is why makeStdenvCross is applied when I'm not doing a   cross compilation.

svn path=/nixpkgs/trunk/; revision=19862
---
 pkgs/lib/customisation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index 76d019a73c2..3b1bed3fc30 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -31,7 +31,7 @@ rec {
   overrideDerivation = drv: f:
     let
       # Filter out special attributes.
-      attrs = removeAttrs drv ["meta" "passthru" "outPath" "drvPath"];
+      attrs = removeAttrs drv ["meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv"];
       newDrv = derivation (attrs // (f drv));
     in newDrv //
       { meta = if drv ? meta then drv.meta else {};