diff options
| author | Shea Levy <shea@shealevy.com> | 2013-05-15 00:39:17 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-05-15 00:39:17 -0400 |
| commit | 03b6fe7422fa41c4fec3536b3290079522da4f27 (patch) | |
| tree | 59c8fb3ca4b6b46618beaf4d78d3be10d60a2343 /pkgs/lib/customisation.nix | |
| parent | 05a02c639e27ddfc8b3f9ef440a14fdccf821fc2 (diff) | |
| download | nixpkgs-03b6fe7422fa41c4fec3536b3290079522da4f27.tar nixpkgs-03b6fe7422fa41c4fec3536b3290079522da4f27.tar.gz nixpkgs-03b6fe7422fa41c4fec3536b3290079522da4f27.tar.bz2 nixpkgs-03b6fe7422fa41c4fec3536b3290079522da4f27.tar.lz nixpkgs-03b6fe7422fa41c4fec3536b3290079522da4f27.tar.xz nixpkgs-03b6fe7422fa41c4fec3536b3290079522da4f27.tar.zst nixpkgs-03b6fe7422fa41c4fec3536b3290079522da4f27.zip | |
Revert "Revert "overrideDerivation: Re-attatch passthru and meta to all outputs""
This reverts commit 18df66f4666c0a2d5a3fa6d6660076e5af5f6af5. I will fix the breakage in upcoming commits. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/lib/customisation.nix')
| -rw-r--r-- | pkgs/lib/customisation.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index 50816f99ec6..bfa61169efb 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -34,7 +34,7 @@ rec { overrideDerivation = drv: f: let newDrv = derivation (drv.drvAttrs // (f drv)); - in newDrv // + in addPassthru 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) |