mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 17:03:01 +00:00
stdenv: Also splice unlisted default "out" output
Otherwise, some cross builds will use the wrong type of dep. This won't affect native builds, and perhaps no extant cross buids either.
This commit is contained in:
parent
13fc982e65
commit
64aebc7679
@ -43,8 +43,9 @@ let
|
||||
// (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; })
|
||||
// (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; });
|
||||
# Get the set of outputs of a derivation
|
||||
getOutputs = value:
|
||||
lib.genAttrs (value.outputs or []) (output: value.${output});
|
||||
getOutputs = value: lib.genAttrs
|
||||
(value.outputs or (lib.optional (value ? out) "out"))
|
||||
(output: value.${output});
|
||||
in
|
||||
# Certain *Cross derivations will fail assertions, but we need their
|
||||
# nativeDrv. We are assuming anything that fails to evaluate is an
|
||||
|
Loading…
Reference in New Issue
Block a user