From 3bfd3e73bfd46a112b8054bdd705f3afae7f71bf Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 5 Dec 2018 21:37:13 +0100 Subject: Reintroduce licenseAccepted option --- pkgs/development/mobile/androidenv/compose-android-packages.nix | 9 ++++++++- pkgs/development/mobile/androidenv/default.nix | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'pkgs/development/mobile/androidenv') 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 {} , pkgs_i686 ? import { 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 { -- cgit 1.4.1