mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-24 06:00:18 +02:00
Merge pull request #29571 from obsidiansystems/better-splice
stdenv: Also splice unlisted default "out" output
This commit is contained in:
commit
45e87854df
|
@ -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 a new issue