diff options
author | Erik Arvstedt <erik.arvstedt@gmail.com> | 2019-08-17 10:48:06 +0200 |
---|---|---|
committer | Erik Arvstedt <erik.arvstedt@gmail.com> | 2019-08-17 11:19:02 +0200 |
commit | 0dab612395f87de6ee0e2641113ff1fe72ebeea1 (patch) | |
tree | 0eaf5c447b777a22ddda52d1282e1121790793d5 /pkgs/development/mobile | |
parent | e48d97f640c410667464ff34c54617912145a430 (diff) | |
download | nixpkgs-0dab612395f87de6ee0e2641113ff1fe72ebeea1.tar nixpkgs-0dab612395f87de6ee0e2641113ff1fe72ebeea1.tar.gz nixpkgs-0dab612395f87de6ee0e2641113ff1fe72ebeea1.tar.bz2 nixpkgs-0dab612395f87de6ee0e2641113ff1fe72ebeea1.tar.lz nixpkgs-0dab612395f87de6ee0e2641113ff1fe72ebeea1.tar.xz nixpkgs-0dab612395f87de6ee0e2641113ff1fe72ebeea1.tar.zst nixpkgs-0dab612395f87de6ee0e2641113ff1fe72ebeea1.zip |
androidenv/emulate-app: fix passing extra args to the sdk composition
This feature was originally intended but left unfinished, as indicated by the unused variables 'args' and 'androidSdkArgNames'.
Diffstat (limited to 'pkgs/development/mobile')
-rw-r--r-- | pkgs/development/mobile/androidenv/emulate-app.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 6c8f6d664d7..ec9001340db 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,24 +1,21 @@ { composeAndroidPackages, stdenv }: { name, app ? null -, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default", useGoogleAPIs ? false +, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default" , enableGPU ? false, extraAVDFiles ? [] , package ? null, activity ? null -, avdHomeDir ? null -}@args: +, avdHomeDir ? null, sdkExtraArgs ? {} +}: let - androidSdkArgNames = builtins.attrNames (builtins.functionArgs composeAndroidPackages); - - # Extract the parameters meant for the Android SDK - androidParams = { + sdkArgs = { platformVersions = [ platformVersion ]; includeEmulator = true; includeSystemImages = true; systemImageTypes = [ systemImageType ]; abiVersions = [ abiVersion ]; - }; + } // sdkExtraArgs; - androidsdkComposition = (composeAndroidPackages androidParams).androidsdk; + androidsdkComposition = (composeAndroidPackages sdkArgs).androidsdk; in stdenv.mkDerivation { inherit name; |