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

Revert "Revert "overrideDerivation: Simplify""

Browse Source 
Now that `drv.passthru' actually is meaningful, this works.

This reverts commit d21bfddc57cdbc6c9a878dc364ffefbfc4455488.

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-05-03 09:09:58 -04:00
parent 84fba68006
commit c2b1ca0296
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/lib/customisation.nix
View File

@ -33,17 +33,14 @@ rec {
overrideDerivation = drv: f: overrideDerivation = drv: f:
let let
# Filter out special attributes. newDrv = derivation (drv.drvAttrs // (f drv));
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));
in newDrv // in newDrv //
{ meta = if drv ? meta then drv.meta else {}; { meta = drv.meta or {};
passthru = if drv ? passthru then drv.passthru else {}; passthru = if drv ? passthru then drv.passthru else {};
} }
// //
(drv.passthru or {})
//
(if (drv ? crossDrv && drv ? nativeDrv) (if (drv ? crossDrv && drv ? nativeDrv)
then { then {
crossDrv = overrideDerivation drv.crossDrv f; crossDrv = overrideDerivation drv.crossDrv f;