Skip to content

androidenv: move licenseAccepted condition to androidsdk #54915

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.

Sign up for GitHub

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

Merged
matthewbauer merged 1 commit into from
Jan 31, 2019
Merged

androidenv: move licenseAccepted condition to androidsdk #54915

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions pkgs/development/mobile/androidenv/compose-android-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,13 @@
, includeExtras ? []
}:

if !licenseAccepted then throw ''
You must accept the Android Software Development Kit License Agreement at
https://developer.android.com/studio/terms
by setting nixpkgs config option 'android_sdk.accept_license = true;'
''
else assert licenseAccepted;

let
inherit (pkgs) stdenv fetchurl makeWrapper unzip;

# Determine the Android os identifier from Nix's system identifier
os = if stdenv.system == "x86_64-linux" then "linux"
else if stdenv.system == "x86_64-darwin" then "macosx"
else "No tarballs found for system architecture: ${stdenv.system}";
else throw "No tarballs found for system architecture: ${stdenv.system}";

# Generated Nix packages
packages = import ./generated/packages.nix {
Expand Down Expand Up @@ -196,7 +189,11 @@ rec {
# This derivation deploys the tools package and symlinks all the desired
# plugins that we want to use.

androidsdk = import ./tools.nix {
androidsdk = if !licenseAccepted then throw ''
You must accept the Android Software Development Kit License Agreement at
https://developer.android.com/studio/terms
by setting nixpkgs config option 'android_sdk.accept_license = true;'
'' else import ./tools.nix {
inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686;
inherit (stdenv) lib;

Expand Down