group packages in attrset literal

This will make generating packages for cross possible.
This commit is contained in:
Charles Hall 2024-01-22 23:07:30 -08:00
parent 67d280dd2e
commit d29591d47d
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF

View file

@ -71,9 +71,10 @@
}; };
in in
{ {
packages.default = package pkgsHost; packages = {
default = package pkgsHost;
packages.oci-image = oci-image =
let let
package = self.packages.${system}.default; package = self.packages.${system}.default;
in in
@ -81,8 +82,8 @@
name = package.pname; name = package.pname;
tag = "latest"; tag = "latest";
config = { config = {
# Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT) are # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
# handled as expected # are handled as expected
Entrypoint = [ Entrypoint = [
"${pkgsHost.lib.getExe' pkgsHost.tini "tini"}" "${pkgsHost.lib.getExe' pkgsHost.tini "tini"}"
"--" "--"
@ -92,6 +93,7 @@
]; ];
}; };
}; };
};
devShells.default = pkgsHost.mkShell { devShells.default = pkgsHost.mkShell {
env = env pkgsHost // { env = env pkgsHost // {