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

Add missing build dependency for Android

This commit is contained in:
Sander van der Burg 2014-01-15 14:55:35 +01:00
parent fd97be3501
commit 0a3fcd502e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/mobile/titaniumenv/build-app.nix
View File

@ -1,4 +1,4 @@
{stdenv, androidsdk, titaniumsdk, xcodewrapper}: {stdenv, androidsdk, titaniumsdk, xcodewrapper, jdk}:
{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ] { appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ]
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false
@ -22,7 +22,7 @@ stdenv.mkDerivation {
name = stdenv.lib.replaceChars [" "] [""] name; name = stdenv.lib.replaceChars [" "] [""] name;
inherit src; inherit src;
buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildInputs = [ jdk ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
buildPhase = '' buildPhase = ''
export HOME=$TMPDIR export HOME=$TMPDIR

2
pkgs/development/mobile/titaniumenv/default.nix
View File

@ -12,7 +12,7 @@ rec {
}; };
buildApp = import ./build-app.nix { buildApp = import ./build-app.nix {
inherit (pkgs) stdenv; inherit (pkgs) stdenv jdk;
inherit (androidenv) androidsdk; inherit (androidenv) androidsdk;
inherit (xcodeenv) xcodewrapper; inherit (xcodeenv) xcodewrapper;
inherit titaniumsdk; inherit titaniumsdk;