diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:21 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:21 +0000 |
| commit | 32e854c156af2228d340ab6d0bf4014bee2d43dc (patch) | |
| tree | f65bd4b8c23aecc7a9d5be110679ffacff1731ba | |
| parent | 5cf90c3b20803ec49c5bae8a47e1ffb4a7a82888 (diff) | |
| download | nixpkgs-32e854c156af2228d340ab6d0bf4014bee2d43dc.tar nixpkgs-32e854c156af2228d340ab6d0bf4014bee2d43dc.tar.gz nixpkgs-32e854c156af2228d340ab6d0bf4014bee2d43dc.tar.bz2 nixpkgs-32e854c156af2228d340ab6d0bf4014bee2d43dc.tar.lz nixpkgs-32e854c156af2228d340ab6d0bf4014bee2d43dc.tar.xz nixpkgs-32e854c156af2228d340ab6d0bf4014bee2d43dc.tar.zst nixpkgs-32e854c156af2228d340ab6d0bf4014bee2d43dc.zip | |
androidenv: move defaults to package file
| -rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 92560105422..8d57f737c34 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,6 +1,6 @@ -{ pkgs ? import <nixpkgs> {} +{ config, pkgs ? import <nixpkgs> {} , pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; } -, licenseAccepted ? false +, licenseAccepted ? config.android_sdk.accept_license or false }: rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afd9c9c0df9..7892d063aa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -783,7 +783,6 @@ in androidenv = callPackage ../development/mobile/androidenv { pkgs_i686 = pkgsi686Linux; - licenseAccepted = config.android_sdk.accept_license or false; }; androidndkPkgs = androidndkPkgs_18b; |