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

box86: init at 0.3.6 #318623

Merged
merged 2 commits into from
Jul 30, 2024
Merged

box86: init at 0.3.6 #318623

merged 2 commits into from
Jul 30, 2024

Conversation

OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Jun 9, 2024

Description of changes

Closes #174113 (stale)

CC @Yeshey since you seem interested in box86

Heavily based on our box64 expression.

Second commit is maybe abit sketchy, so it's separate in case we don't want it.

Since box86 is only supported on 32-bit userland, its supported platforms can also only be 32-bit. But one may want to use it to run 32-bit x86 software on 64-bit non-x86 hardware as well. It's trivial to tell nix to cross-compile the package, but then the user would need to compile this on their own hardware since (AFAIU) the cache doesn't serve many 32-bit packages (especially on ARM I imagine?). This should work around this by mapping x86_64 -> i686 & aarch64 -> armv7l, which should hopefully let the cache be able to substitute this for ppl.

Things done

  • Built on platform(s)
    • x86_64-linux (i686-linux cross)
    • aarch64-linux (armv7l-linux cross)
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jun 9, 2024
@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Jun 9, 2024

@ofborg build box86 box86.passthru.tests

@Yeshey
Copy link

Yeshey commented Jun 10, 2024

cool, @OPNA2608, hit me up if I could help with anything else

Yeshey added a commit to Yeshey/nixOS-Config that referenced this pull request Jun 10, 2024
@Yeshey
Copy link

Yeshey commented Jul 23, 2024

any chance for this to go through?

@OPNA2608 OPNA2608 added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jul 23, 2024
@OPNA2608 OPNA2608 merged commit 41875e7 into NixOS:master Jul 30, 2024
28 checks passed
@Yeshey Yeshey mentioned this pull request Aug 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants