top-level: add depsHostHost splicing

This was originally made to throw because pkgsHostHost was unimplemented.
Now that we have the full range of pkgs*, we can add this normally.
main
Ryan Burns 3 years ago
parent 8a30877567
commit c47f991435
  1. 6
      pkgs/top-level/splice.nix

@ -42,7 +42,7 @@ let
valueBuildBuild = pkgsBuildBuild.${name} or {}; valueBuildBuild = pkgsBuildBuild.${name} or {};
valueBuildHost = pkgsBuildHost.${name} or {}; valueBuildHost = pkgsBuildHost.${name} or {};
valueBuildTarget = pkgsBuildTarget.${name} or {}; valueBuildTarget = pkgsBuildTarget.${name} or {};
valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splice."; valueHostHost = pkgsHostHost.${name} or {};
valueHostTarget = pkgsHostTarget.${name} or {}; valueHostTarget = pkgsHostTarget.${name} or {};
valueTargetTarget = pkgsTargetTarget.${name} or {}; valueTargetTarget = pkgsTargetTarget.${name} or {};
augmentedValue = defaultValue augmentedValue = defaultValue
@ -53,7 +53,7 @@ let
__spliced = __spliced =
(lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
// (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; }) // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
// { hostHost = valueHostHost; } // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })
// (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget; // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget;
}); });
}; };
@ -81,7 +81,7 @@ let
pkgsBuildBuild = valueBuildBuild; pkgsBuildBuild = valueBuildBuild;
pkgsBuildHost = valueBuildHost; pkgsBuildHost = valueBuildHost;
pkgsBuildTarget = valueBuildTarget; pkgsBuildTarget = valueBuildTarget;
pkgsHostHost = {}; pkgsHostHost = valueHostHost;
pkgsHostTarget = valueHostTarget; pkgsHostTarget = valueHostTarget;
pkgsTargetTarget = valueTargetTarget; pkgsTargetTarget = valueTargetTarget;
# Don't be fancy about non-derivations. But we could have used used # Don't be fancy about non-derivations. But we could have used used

Loading…
Cancel
Save