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

Merge branch 'fix-splice' into ericson2314-cross-base

Browse Source
This commit is contained in:
John Ericson 2017-12-10 17:15:07 -05:00
commit 0c88078d37
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,26 +37,25 @@ let
inherit name; inherit name;
value = let value = let
defaultValue = mash.${name}; defaultValue = mash.${name};
buildValue = buildPkgs.${name}; # `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.
runValue = runPkgs.${name}; buildValue = buildPkgs.${name} or {};
runValue = runPkgs.${name} or {};
augmentedValue = defaultValue augmentedValue = defaultValue
// (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. If one derivation fails to
# evaluate we don't want to diverge the entire splice, so we fall back
# on {}
tryGetOutputs = value0: let tryGetOutputs = value0: let
eval = builtins.tryEval value0; inherit (builtins.tryEval value0) success value;
in getOutputs (if eval.success then eval.value else {}); in getOutputs (lib.optionalAttrs success value);
getOutputs = value: lib.genAttrs getOutputs = value: lib.genAttrs
(value.outputs or (lib.optional (value ? out) "out")) (value.outputs or (lib.optional (value ? out) "out"))
(output: value.${output}); (output: value.${output});
in in
# Certain *Cross derivations will fail assertions, but we need their
# nativeDrv. We are assuming anything that fails to evaluate is an
# attrset (including derivation) and thus can be unioned.
if !(builtins.tryEval defaultValue).success then augmentedValue
# The derivation along with its outputs, which we recur # The derivation along with its outputs, which we recur
# on to splice them together. # on to splice them together.
else if lib.isDerivation defaultValue then augmentedValue if lib.isDerivation defaultValue then augmentedValue
// splicer (tryGetOutputs buildValue) (getOutputs runValue) // splicer (tryGetOutputs buildValue) (getOutputs runValue)
# Just recur on plain attrsets # Just recur on plain attrsets
else if lib.isAttrs defaultValue then splicer buildValue runValue else if lib.isAttrs defaultValue then splicer buildValue runValue