Revert "Revert "Revert "Revert "overrideDerivation: Simplify""""

This reverts commit abf2d3677382bb93b989528cc6ed71ac6d5bd3b8.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index a35b44e9f6e..50816f99ec6 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -33,17 +33,14 @@ rec {
      
   overrideDerivation = drv: f:
     let
-      # 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));
+      newDrv = derivation (drv.drvAttrs // (f drv));
     in newDrv //
-      { meta = if drv ? meta then drv.meta else {};
+      { meta = drv.meta or {};
         passthru = if drv ? passthru then drv.passthru else {};
       }
       //
+      (drv.passthru or {})
+      //
       (if (drv ? crossDrv && drv ? nativeDrv)
        then {
          crossDrv = overrideDerivation drv.crossDrv f;