diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2018-12-05 21:37:13 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2018-12-18 21:16:07 +0100 |
| commit | 3bfd3e73bfd46a112b8054bdd705f3afae7f71bf (patch) | |
| tree | 186431dc0f5dde0a2c526d1778f9f67254fd11c5 /pkgs/development/mobile/androidenv | |
| parent | b99ac1c9044809fa0fec342fceaaadeb08d4a669 (diff) | |
| download | nixpkgs-3bfd3e73bfd46a112b8054bdd705f3afae7f71bf.tar nixpkgs-3bfd3e73bfd46a112b8054bdd705f3afae7f71bf.tar.gz nixpkgs-3bfd3e73bfd46a112b8054bdd705f3afae7f71bf.tar.bz2 nixpkgs-3bfd3e73bfd46a112b8054bdd705f3afae7f71bf.tar.lz nixpkgs-3bfd3e73bfd46a112b8054bdd705f3afae7f71bf.tar.xz nixpkgs-3bfd3e73bfd46a112b8054bdd705f3afae7f71bf.tar.zst nixpkgs-3bfd3e73bfd46a112b8054bdd705f3afae7f71bf.zip | |
Reintroduce licenseAccepted option
Diffstat (limited to 'pkgs/development/mobile/androidenv')
| -rw-r--r-- | pkgs/development/mobile/androidenv/compose-android-packages.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 9125d3140e2..690f9712a10 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686}: +{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: { toolsVersion ? "25.2.5" , platformToolsVersion ? "28.0.1" @@ -20,6 +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; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index b7aaccd3763..92560105422 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,11 +1,12 @@ { pkgs ? import <nixpkgs> {} , pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; } +, licenseAccepted ? false }: rec { composeAndroidPackages = import ./compose-android-packages.nix { inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook; - inherit pkgs pkgs_i686; + inherit pkgs pkgs_i686 licenseAccepted; }; buildApp = import ./build-app.nix { |