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

fix build for proot on aarch64 #29985

Merged
merged 2 commits into from Oct 5, 2017
Merged

Conversation

makefu
Copy link
Contributor

@makefu makefu commented Oct 1, 2017

Motivation for this change

right now proot does not build on aarch64. This commit uses the aarch64 patch from debian to fix the build.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS (aarch64)
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@orivej
Copy link
Contributor

orivej commented Oct 1, 2017

Upstream has implemented aarch64 differently: https://github.com/proot-me/PRoot/commits/master/src/loader/assembly-arm64.h . I'd suggest updating proot to master or to proot-me/proot@afe225dc because it is the latest maintenance commit. What do you think?

@makefu
Copy link
Contributor Author

makefu commented Oct 1, 2017

it seems that all distros (debian,ubuntu,gentoo,arch) package 5.1.0 (the 2014 release). wouldn't it be weird if we follow master instead?

@orivej orivej merged commit 7c3f185 into NixOS:master Oct 5, 2017
@orivej
Copy link
Contributor

orivej commented Oct 5, 2017

That's ok to merge for now.

@makefu makefu deleted the pkgs/proot/aarch64-fix branch January 27, 2018 11:21
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

2 participants