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

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

Browse Source 
This reverts commit 6b0e94a516c5aa8d0e18e13028c7ccf541062c99.

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