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

Revert "overrideDerivation: Simplify"

Browse Source 
This reverts commit 6640000cb7, which
caused passthru attributes not to be passed correctly after calling
overrideDerivation.  E.g. in the evaluation of the Nix jobset:

at `deb_ubuntu1004i386' [officialRelease = false, nix = ...]:
attribute `fullName' missing
This commit is contained in:
Eelco Dolstra 2013-05-03 11:46:49 +02:00
parent 7b868bbff4
commit d21bfddc57
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/lib/customisation.nix
View File

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