alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #54915 from matthewbauer/rework-android-assert

Browse source 
androidenv: move licenseAccepted condition to androidsdk
This commit is contained in:
Matthew Bauer 2019-01-31 10:31:27 -05:00 committed by GitHub
parent 74ee7f73f8 9c770c4efa
commit 6182d28cab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/mobile/androidenv/compose-android-packages.nix
View file

@ -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 {
@ -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;