diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2014-01-15 14:55:35 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2014-01-15 14:55:35 +0100 |
| commit | 0a3fcd502e1bfb8990709267df0f712126ead995 (patch) | |
| tree | 1bf9df47a3bc2f0fe4e943e5b61b3c9a0e9f924d /pkgs | |
| parent | fd97be3501c07a933d70278a4871655568e808e9 (diff) | |
| download | nixpkgs-0a3fcd502e1bfb8990709267df0f712126ead995.tar nixpkgs-0a3fcd502e1bfb8990709267df0f712126ead995.tar.gz nixpkgs-0a3fcd502e1bfb8990709267df0f712126ead995.tar.bz2 nixpkgs-0a3fcd502e1bfb8990709267df0f712126ead995.tar.lz nixpkgs-0a3fcd502e1bfb8990709267df0f712126ead995.tar.xz nixpkgs-0a3fcd502e1bfb8990709267df0f712126ead995.tar.zst nixpkgs-0a3fcd502e1bfb8990709267df0f712126ead995.zip | |
Add missing build dependency for Android
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/build-app.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 83f66af18da..ebdace06e78 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -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" ] , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false @@ -22,7 +22,7 @@ stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + buildInputs = [ jdk ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' export HOME=$TMPDIR diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6a58fbecb29..07dc2f4440d 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -12,7 +12,7 @@ rec { }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv; + inherit (pkgs) stdenv jdk; inherit (androidenv) androidsdk; inherit (xcodeenv) xcodewrapper; inherit titaniumsdk; |