From 64aebc7679bc9aaa94c3696390174acd62ef1f3a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 Sep 2017 14:46:43 -0400 Subject: 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. --- pkgs/top-level/splice.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 43951100de3d..44a46b7b6929 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -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 -- cgit 1.4.1