diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-09-19 15:11:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 15:11:53 -0400 |
| commit | 45e87854df1f526de4466dd040eb9604eec428d9 (patch) | |
| tree | 97058598f09aaf25e6ac13bd168313f1e5c1e597 /pkgs | |
| parent | 7e6011083da98a4cd819f828dfe006826b7cb669 (diff) | |
| parent | 64aebc7679bc9aaa94c3696390174acd62ef1f3a (diff) | |
| download | nixlib-45e87854df1f526de4466dd040eb9604eec428d9.tar nixlib-45e87854df1f526de4466dd040eb9604eec428d9.tar.gz nixlib-45e87854df1f526de4466dd040eb9604eec428d9.tar.bz2 nixlib-45e87854df1f526de4466dd040eb9604eec428d9.tar.lz nixlib-45e87854df1f526de4466dd040eb9604eec428d9.tar.xz nixlib-45e87854df1f526de4466dd040eb9604eec428d9.tar.zst nixlib-45e87854df1f526de4466dd040eb9604eec428d9.zip | |
Merge pull request #29571 from obsidiansystems/better-splice
stdenv: Also splice unlisted default "out" output
Diffstat (limited to 'pkgs')
| -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 |