movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 21:25:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit c2b1ca0296.

It still breaks VM builds: http://hydra.nixos.org/build/4858140
This commit is contained in:
Eelco Dolstra 2013-05-07 10:49:22 +02:00
parent 18df66f466
commit abf2d36773
1 changed files with 7 additions and 4 deletions
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;