treewide: replace addPassthru

2018-01-14 19:53:57 +00:00
parent 8606dd8556
commit 85cd22cf7d
2 changed files with 2 additions and 2 deletions
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -36,7 +36,7 @@ rec {
  overrideDerivation = drv: f:
    let
      newDrv = derivation (drv.drvAttrs // (f drv));
-    in lib.flip addPassthru newDrv (
+    in lib.flip (extendDerivation true) newDrv (
      { meta = drv.meta or {};
        passthru = if drv ? passthru then drv.passthru else {};
      }
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -134,7 +134,7 @@ let
    passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
  };

-  addPassthru' = lib.addPassthru passthru;
+  addPassthru' = lib.extendDerivation true passthru;

  nativeDrv = addPassthru' kernel.nativeDrv;