diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2013-10-15 16:32:16 +0200 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2013-10-15 16:32:16 +0200 |
| commit | ce7f235a09402791ffcbae5ce5fd9e93e8296b7e (patch) | |
| tree | 9e60996a81c1f8e5db90ee5a7ffc02cfaf63e804 /pkgs/development | |
| parent | ae74b0ae587df0750843da2d7cfc6e1e24e63bf2 (diff) | |
| download | nixlib-ce7f235a09402791ffcbae5ce5fd9e93e8296b7e.tar nixlib-ce7f235a09402791ffcbae5ce5fd9e93e8296b7e.tar.gz nixlib-ce7f235a09402791ffcbae5ce5fd9e93e8296b7e.tar.bz2 nixlib-ce7f235a09402791ffcbae5ce5fd9e93e8296b7e.tar.lz nixlib-ce7f235a09402791ffcbae5ce5fd9e93e8296b7e.tar.xz nixlib-ce7f235a09402791ffcbae5ce5fd9e93e8296b7e.tar.zst nixlib-ce7f235a09402791ffcbae5ce5fd9e93e8296b7e.zip | |
Make arbitrary arguments to the generic builder possible
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/mobile/androidenv/build-app.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 2792d364f15c..3349cd5b9beb 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,5 +1,5 @@ { stdenv, androidsdk, jdk, ant }: -{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" +args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null }: @@ -15,9 +15,8 @@ let abiVersions = []; }; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = stdenv.lib.replaceChars [" "] [""] name; - inherit src; ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}"; @@ -45,4 +44,5 @@ stdenv.mkDerivation { mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products ''; -} +} // +builtins.removeAttrs args ["name"]) |