From 18df66f4666c0a2d5a3fa6d6660076e5af5f6af5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 May 2013 10:48:53 +0200
Subject: [PATCH] Revert "overrideDerivation: Re-attatch passthru and meta to
 all outputs"

This reverts commit 6b0e94a516c5aa8d0e18e13028c7ccf541062c99.

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

diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index bfa61169efb..50816f99ec6 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -34,7 +34,7 @@ rec {
   overrideDerivation = drv: f:
     let
       newDrv = derivation (drv.drvAttrs // (f drv));
-    in addPassthru newDrv (
+    in newDrv //
       { meta = drv.meta or {};
         passthru = if drv ? passthru then drv.passthru else {};
       }
@@ -46,7 +46,7 @@ rec {
          crossDrv = overrideDerivation drv.crossDrv f;
          nativeDrv = overrideDerivation drv.nativeDrv f;
        }
-       else { }));
+       else { });
 
 
   # usage: (you can use override multiple times)