diff options
author | Ryan Burns <rtburns@protonmail.com> | 2021-11-29 21:46:27 -0800 |
---|---|---|
committer | Ryan Burns <rtburns@protonmail.com> | 2021-12-02 17:22:54 -0800 |
commit | c47f9914356d15e7d3ee6e9f57d7140502bc43bf (patch) | |
tree | 3c400060878cff23e3783a0af8be3e924e90a01c | |
parent | 8a308775674e178495767df90c419425474582a1 (diff) | |
download | nixpkgs-c47f9914356d15e7d3ee6e9f57d7140502bc43bf.tar nixpkgs-c47f9914356d15e7d3ee6e9f57d7140502bc43bf.tar.gz nixpkgs-c47f9914356d15e7d3ee6e9f57d7140502bc43bf.tar.bz2 nixpkgs-c47f9914356d15e7d3ee6e9f57d7140502bc43bf.tar.lz nixpkgs-c47f9914356d15e7d3ee6e9f57d7140502bc43bf.tar.xz nixpkgs-c47f9914356d15e7d3ee6e9f57d7140502bc43bf.tar.zst nixpkgs-c47f9914356d15e7d3ee6e9f57d7140502bc43bf.zip |
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.
-rw-r--r-- | pkgs/top-level/splice.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index a093442d369..459baaca2e6 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -42,7 +42,7 @@ let valueBuildBuild = pkgsBuildBuild.${name} or {}; valueBuildHost = pkgsBuildHost.${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 {}; valueTargetTarget = pkgsTargetTarget.${name} or {}; augmentedValue = defaultValue @@ -53,7 +53,7 @@ let __spliced = (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; }) - // { hostHost = valueHostHost; } + // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; }) // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget; }); }; @@ -81,7 +81,7 @@ let pkgsBuildBuild = valueBuildBuild; pkgsBuildHost = valueBuildHost; pkgsBuildTarget = valueBuildTarget; - pkgsHostHost = {}; + pkgsHostHost = valueHostHost; pkgsHostTarget = valueHostTarget; pkgsTargetTarget = valueTargetTarget; # Don't be fancy about non-derivations. But we could have used used |