public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29571 from obsidiansystems/better-splice

Browse Source 
stdenv: Also splice unlisted default "out" output
This commit is contained in:
John Ericson 2017-09-19 15:11:53 -04:00 committed by GitHub
commit 45e87854df
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/top-level/splice.nix
View File

@ -43,8 +43,9 @@ let
// (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; }) // (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; })
// (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; }); // (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; });
# Get the set of outputs of a derivation # Get the set of outputs of a derivation
getOutputs = value: getOutputs = value: lib.genAttrs
lib.genAttrs (value.outputs or []) (output: value.${output}); (value.outputs or (lib.optional (value ? out) "out"))
(output: value.${output});
in in
# Certain *Cross derivations will fail assertions, but we need their # Certain *Cross derivations will fail assertions, but we need their
# nativeDrv. We are assuming anything that fails to evaluate is an # nativeDrv. We are assuming anything that fails to evaluate is an