diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-19 14:46:43 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-19 14:48:23 -0400 |
commit | 64aebc7679bc9aaa94c3696390174acd62ef1f3a (patch) | |
tree | 51b2f9eaeda20db2ce68f9c0e62622d5f20361e2 | |
parent | 13fc982e650381c6ca5a76470ae1d23abbc000ab (diff) | |
download | nixlib-64aebc7679bc9aaa94c3696390174acd62ef1f3a.tar nixlib-64aebc7679bc9aaa94c3696390174acd62ef1f3a.tar.gz nixlib-64aebc7679bc9aaa94c3696390174acd62ef1f3a.tar.bz2 nixlib-64aebc7679bc9aaa94c3696390174acd62ef1f3a.tar.lz nixlib-64aebc7679bc9aaa94c3696390174acd62ef1f3a.tar.xz nixlib-64aebc7679bc9aaa94c3696390174acd62ef1f3a.tar.zst nixlib-64aebc7679bc9aaa94c3696390174acd62ef1f3a.zip |
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.
-rw-r--r-- | pkgs/top-level/splice.nix | 5 |
1 files changed, 3 insertions, 2 deletions
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 |