public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reintroduce licenseAccepted option

Browse Source
This commit is contained in:
Sander van der Burg 2018-12-05 21:37:13 +01:00
parent b99ac1c904
commit 3bfd3e73bf
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/mobile/androidenv/compose-android-packages.nix
View File

@ -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" { toolsVersion ? "25.2.5"
, platformToolsVersion ? "28.0.1" , platformToolsVersion ? "28.0.1"
@ -20,6 +20,13 @@
, includeExtras ? [] , 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 let
inherit (pkgs) stdenv fetchurl makeWrapper unzip; inherit (pkgs) stdenv fetchurl makeWrapper unzip;

3
pkgs/development/mobile/androidenv/default.nix
View File

@ -1,11 +1,12 @@
{ pkgs ? import <nixpkgs> {} { pkgs ? import <nixpkgs> {}
, pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; } , pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; }
, licenseAccepted ? false
}: }:
rec { rec {
composeAndroidPackages = import ./compose-android-packages.nix { composeAndroidPackages = import ./compose-android-packages.nix {
inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook; inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook;
inherit pkgs pkgs_i686; inherit pkgs pkgs_i686 licenseAccepted;
}; };
buildApp = import ./build-app.nix { buildApp = import ./build-app.nix {

2
pkgs/top-level/all-packages.nix
View File

@ -831,7 +831,7 @@ in
androidenv = callPackage ../development/mobile/androidenv { androidenv = callPackage ../development/mobile/androidenv {
pkgs_i686 = pkgsi686Linux; pkgs_i686 = pkgsi686Linux;
#licenseAccepted = (config.android_sdk.accept_license or false); licenseAccepted = config.android_sdk.accept_license or false;
}; };
androidndkPkgs = androidndkPkgs_17c; androidndkPkgs = androidndkPkgs_17c;