From 03b6fe7422fa41c4fec3536b3290079522da4f27 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 15 May 2013 00:39:17 -0400
Subject: [PATCH] Revert "Revert "overrideDerivation: Re-attatch passthru and
 meta to all outputs""

This reverts commit 18df66f4666c0a2d5a3fa6d6660076e5af5f6af5.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 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 50816f99ec6..bfa61169efb 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 newDrv //
+    in addPassthru 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)