about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorAli Abrar <aliabrar@gmail.com>2017-05-16 18:38:23 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2018-06-11 13:25:41 -0400
commit465e3a01d40ba3cc6af962dbf3587e6eea276280 (patch)
tree61b26de768bd8b4412e9112805af1671797a90bc /pkgs/development
parent1cc64da8d4bad1f1134103fa466f627c4544acd6 (diff)
downloadnixlib-465e3a01d40ba3cc6af962dbf3587e6eea276280.tar
nixlib-465e3a01d40ba3cc6af962dbf3587e6eea276280.tar.gz
nixlib-465e3a01d40ba3cc6af962dbf3587e6eea276280.tar.bz2
nixlib-465e3a01d40ba3cc6af962dbf3587e6eea276280.tar.lz
nixlib-465e3a01d40ba3cc6af962dbf3587e6eea276280.tar.xz
nixlib-465e3a01d40ba3cc6af962dbf3587e6eea276280.tar.zst
nixlib-465e3a01d40ba3cc6af962dbf3587e6eea276280.zip
Add android sdk license acceptance
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/mobile/androidenv/build-gradle-app.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/mobile/androidenv/build-gradle-app.nix b/pkgs/development/mobile/androidenv/build-gradle-app.nix
index 8921e78528ce..ee6783214723 100644
--- a/pkgs/development/mobile/androidenv/build-gradle-app.nix
+++ b/pkgs/development/mobile/androidenv/build-gradle-app.nix
@@ -2,10 +2,11 @@
 
 args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, useExtraSupportLibs ? false, useGooglePlayServices ? false
 , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
-, useNDK ? false, buildInputs ? [], mavenDeps, gradleTask, buildDirectory ? "./."
+, useNDK ? false, buildInputs ? [], mavenDeps, gradleTask, buildDirectory ? "./.", acceptAndroidSdkLicenses ? false
 }:
 
 assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null;
+assert acceptAndroidSdkLicenses;
 
 let
   m2install = { repo, version, artifactId, groupId, jarSha256, pomSha256, aarSha256, suffix ? "" }:
@@ -108,7 +109,6 @@ stdenv.mkDerivation ({
     echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
 
     export APP_HOME=`pwd`
-    export CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
     mkdir -p .m2/repository
     for dep in $DEPENDENCIES ; do