public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: replace `addPassthru`

This commit is contained in:
Jan Malakhovski 2018-01-14 19:53:57 +00:00
parent 8606dd8556
commit 85cd22cf7d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/customisation.nix
View File

@ -36,7 +36,7 @@ rec {
overrideDerivation = drv: f: overrideDerivation = drv: f:
let let
newDrv = derivation (drv.drvAttrs // (f drv)); newDrv = derivation (drv.drvAttrs // (f drv));
in lib.flip addPassthru newDrv ( in lib.flip (extendDerivation true) newDrv (
{ meta = drv.meta or {}; { meta = drv.meta or {};
passthru = if drv ? passthru then drv.passthru else {}; passthru = if drv ? passthru then drv.passthru else {};
} }

2
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -134,7 +134,7 @@ let
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
}; };
addPassthru' = lib.addPassthru passthru; addPassthru' = lib.extendDerivation true passthru;
nativeDrv = addPassthru' kernel.nativeDrv; nativeDrv = addPassthru' kernel.nativeDrv;