From 7dffd9697859e8002c09caab1d30698151f432e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Mar 2010 00:01:56 +0000
Subject: [PATCH] * Allow `overrideDerivation' to work on derivations to which 
  `makeOverridable' has been applied (!).  Ugly.

svn path=/nixpkgs/trunk/; revision=20591
---
 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 d5c9e99727e..e6a26958ae2 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" "hostDrv" "buildDrv" "type"];
+      attrs = removeAttrs drv ["meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type" "override" "deepOverride" "origArgs"];
       newDrv = derivation (attrs // (f drv));
     in newDrv //
       { meta = if drv ? meta then drv.meta else {};