movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

Revert "overrideDerivation: Re-attatch passthru and meta to all outputs"

Browse source 
This reverts commit 6b0e94a516.

It still breaks VM builds: http://hydra.nixos.org/build/4858140
This commit is contained in:
Eelco Dolstra 2013-05-07 10:48:53 +02:00
parent b0ad529987
commit 18df66f466
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/lib/customisation.nix
View file

@ -34,7 +34,7 @@ rec {
overrideDerivation = drv: f: overrideDerivation = drv: f:
let let
newDrv = derivation (drv.drvAttrs // (f drv)); newDrv = derivation (drv.drvAttrs // (f drv));
in addPassthru newDrv ( in 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 {};
} }
@ -46,7 +46,7 @@ rec {
crossDrv = overrideDerivation drv.crossDrv f; crossDrv = overrideDerivation drv.crossDrv f;
nativeDrv = overrideDerivation drv.nativeDrv f; nativeDrv = overrideDerivation drv.nativeDrv f;
} }
else { })); else { });
# usage: (you can use override multiple times) # usage: (you can use override multiple times)