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

titaniumsdk: fix to make it work with new android SDK and NPM packages + add titaniumsdk version 5.2

Browse Source
This commit is contained in:
Sander van der Burg
2016-09-01 13:25:46 +00:00
parent 29a53017a4
commit 21666526b9
8 changed files with 51 additions and 2729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/mobile/titaniumenv/default.nix
+4 -3
View File
@@ -1,4 +1,4 @@
{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.1.2.GA"}:
{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.2.3.GA"}:
rec {
androidenv = pkgs.androidenv;
@@ -10,6 +10,7 @@ rec {
titaniumsdk = let
titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix
else if tiVersion == "5.2.3.GA" then ./titaniumsdk-5.2.nix
else throw "Titanium version not supported: "+tiVersion;
in
import titaniumSdkFile {
@@ -17,8 +18,8 @@ rec {
};
buildApp = import ./build-app.nix {
inherit (pkgs) stdenv python which jdk;
titanium = (import ./cli { inherit (pkgs.stdenv) system; }).titanium {};
inherit (pkgs) stdenv python which jdk nodejs;
inherit (pkgs.nodePackages) titanium alloy;
inherit (androidenv) androidsdk;
inherit (xcodeenv) xcodewrapper;
inherit titaniumsdk xcodeBaseDir;