From abf2d3677382bb93b989528cc6ed71ac6d5bd3b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 May 2013 10:49:22 +0200
Subject: [PATCH] Revert "Revert "Revert "overrideDerivation: Simplify"""

This reverts commit c2b1ca029663d1ad41bbffd3d09becada06c74cc.

It still breaks VM builds: http://hydra.nixos.org/build/4858140
---
 pkgs/lib/customisation.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index 50816f99ec6..a35b44e9f6e 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -33,14 +33,17 @@ rec {
      
   overrideDerivation = drv: f:
     let
-      newDrv = derivation (drv.drvAttrs // (f drv));
+      # Filter out special attributes.
+      drop = [ "meta" "passthru" "outPath" "drvPath" "crossDrv" "nativeDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ]
+              # also drop functions such as .merge .override etc
+             ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv);
+      attrs = removeAttrs drv drop;
+      newDrv = derivation (attrs // (f drv));
     in newDrv //
-      { meta = drv.meta or {};
+      { meta = if drv ? meta then drv.meta else {};
         passthru = if drv ? passthru then drv.passthru else {};
       }
       //
-      (drv.passthru or {})
-      //
       (if (drv ? crossDrv && drv ? nativeDrv)
        then {
          crossDrv = overrideDerivation drv.crossDrv f;