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

titaniumsdk: Make xcode path configurable

Browse Source
This commit is contained in:
Sander van der Burg 2014-10-07 18:13:52 +02:00
parent 05130419d5
commit c07579aa4a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.4.0.GA"}: {pkgs, pkgs_i686, xcodeVersion ? "6.0", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.4.0.GA"}:
let let
# We have to use Oracle's JDK. On Darwin, just simply expose the host system's # We have to use Oracle's JDK. On Darwin, just simply expose the host system's
@ -25,6 +25,7 @@ rec {
xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv.override { xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv.override {
version = xcodeVersion; version = xcodeVersion;
inherit xcodeBaseDir;
} else null; } else null;
titaniumsdk = let titaniumsdk = let

15
pkgs/development/mobile/titaniumenv/examples/default.nix
View File

@ -1,6 +1,7 @@
{ nixpkgs ? <nixpkgs> { nixpkgs ? <nixpkgs>
, systems ? [ "x86_64-linux" "x86_64-darwin" ] , systems ? [ "x86_64-linux" "x86_64-darwin" ]
, xcodeVersion ? "5.0" , xcodeVersion ? "6.0.1"
, xcodeBaseDir ? "/Applications/Xcode.app"
, tiVersion ? "3.4.0.GA" , tiVersion ? "3.4.0.GA"
, rename ? false , rename ? false
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
@ -18,7 +19,7 @@ rec {
in in
import ./kitchensink { import ./kitchensink {
inherit (pkgs) fetchgit; inherit (pkgs) fetchgit;
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
inherit tiVersion; inherit tiVersion;
target = "android"; target = "android";
}); });
@ -29,7 +30,7 @@ rec {
in in
import ./kitchensink { import ./kitchensink {
inherit (pkgs) fetchgit; inherit (pkgs) fetchgit;
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
inherit tiVersion; inherit tiVersion;
target = "android"; target = "android";
release = true; release = true;
@ -60,21 +61,21 @@ rec {
rec { rec {
kitchensink_ios_development = import ./kitchensink { kitchensink_ios_development = import ./kitchensink {
inherit (pkgs) fetchgit; inherit (pkgs) fetchgit;
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
inherit tiVersion; inherit tiVersion;
target = "iphone"; target = "iphone";
}; };
simulate_kitchensink_iphone = import ./simulate-kitchensink { simulate_kitchensink_iphone = import ./simulate-kitchensink {
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; };
kitchensink = kitchensink_ios_development; kitchensink = kitchensink_ios_development;
device = "iPhone"; device = "iPhone";
}; };
simulate_kitchensink_ipad = import ./simulate-kitchensink { simulate_kitchensink_ipad = import ./simulate-kitchensink {
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; };
kitchensink = kitchensink_ios_development; kitchensink = kitchensink_ios_development;
device = "iPad"; device = "iPad";
}; };
@ -85,7 +86,7 @@ rec {
{ {
kitchensink_ipa = import ./kitchensink { kitchensink_ipa = import ./kitchensink {
inherit (pkgs) stdenv fetchgit; inherit (pkgs) stdenv fetchgit;
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
target = "iphone"; target = "iphone";
inherit tiVersion; inherit tiVersion;
release = true; release = true;