From 6b0e94a516c5aa8d0e18e13028c7ccf541062c99 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 3 May 2013 09:12:55 -0400
Subject: [PATCH] overrideDerivation: Re-attatch passthru and meta to all
 outputs

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 50816f99ec60..bfa61169efb1 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)