mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 07:00:43 +00:00
* Fix the VM builds. They were broken because a `hostDrv' and
`buildDrv' attribute gets added to every derivation in `makeStdenvCross'. So filter out those attributes. But the real question is why makeStdenvCross is applied when I'm not doing a cross compilation. svn path=/nixpkgs/trunk/; revision=19862
This commit is contained in:
parent
baebba7d05
commit
f1713f192d
|
@ -31,7 +31,7 @@ rec {
|
|||
overrideDerivation = drv: f:
|
||||
let
|
||||
# Filter out special attributes.
|
||||
attrs = removeAttrs drv ["meta" "passthru" "outPath" "drvPath"];
|
||||
attrs = removeAttrs drv ["meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv"];
|
||||
newDrv = derivation (attrs // (f drv));
|
||||
in newDrv //
|
||||
{ meta = if drv ? meta then drv.meta else {};
|
||||
|
|
Loading…
Reference in a new issue