androidenv: fix compose-android-packages on non-x86_64 environments #304716
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This has always been possible, however the nix package previously checked against stdenv.system with only x86_64 architectures used.
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/3803 |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This has always been possible, however the nix package previously checked against stdenv.system with only x86_64 architectures used.
Description of changes
These changes allow using compose-android-packages to create an Android environment on non-x86_64 platforms (in my case, Apple Silicon devices). Previously, a check was done by checking against
stdenv.systemagainst a pair of predefined architectures, even though the packages from Google that are downloaded are platform-independent (although not OS-independent). I replaced these checks to only check the OS being used, instead of checking the OS and architecture.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/) (note: just tested within a nix shell by using adb)Add a 馃憤 reaction to pull requests you find important.