Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add nix.linux-builder.systems option to set corresponding nix.buildMachines.*.systems option #816

Merged
merged 3 commits into from
Feb 23, 2024

Conversation

ethnt
Copy link
Contributor

@ethnt ethnt commented Nov 22, 2023

I've set up my local linux-builder to emulate x86_64-linux as well as aarch64-linux (jury's out as to how well that will work), but I still need to be able to set that option in /etc/nix/machines. I've added an option for this in nix.linux-builder. Potentially in the future it would be a better idea to simply allow extraBuilderConfig or something similar, but I stuck with convention in this PR.

Copy link
Collaborator

@Enzime Enzime left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it makes more sense to specify the default system as part of the new systems option

modules/nix/linux-builder.nix Outdated Show resolved Hide resolved
modules/nix/linux-builder.nix Outdated Show resolved Hide resolved
modules/nix/linux-builder.nix Outdated Show resolved Hide resolved
@ethnt
Copy link
Contributor Author

ethnt commented Nov 23, 2023

@Enzime Thanks for the review, I've made those changes!

@ethnt ethnt force-pushed the linux-builder-systems-config branch from 297bc79 to 72dd60b Compare November 23, 2023 01:43
@ethnt ethnt requested a review from Enzime November 23, 2023 01:43
@@ -57,6 +57,22 @@ in
'';
};

systems = mkOption {
type = types.listOf types.str;
default = [ "${stdenv.hostPlatform.uname.processor}-linux" ];
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
default = [ "${stdenv.hostPlatform.uname.processor}-linux" ];
default = [ "${stdenv.hostPlatform.uname.processor}-linux" ];
defaultText = literalExpression ''[ "''${stdenv.hostPlatform.uname.processor}-linux" ]'';

@domenkozar domenkozar merged commit 9f4fbed into LnL7:master Feb 23, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants