mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
titaniumsdk: Make xcode path configurable
This commit is contained in:
parent
05130419d5
commit
c07579aa4a
@ -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
|
||||
# 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 {
|
||||
version = xcodeVersion;
|
||||
inherit xcodeBaseDir;
|
||||
} else null;
|
||||
|
||||
titaniumsdk = let
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ nixpkgs ? <nixpkgs>
|
||||
, systems ? [ "x86_64-linux" "x86_64-darwin" ]
|
||||
, xcodeVersion ? "5.0"
|
||||
, xcodeVersion ? "6.0.1"
|
||||
, xcodeBaseDir ? "/Applications/Xcode.app"
|
||||
, tiVersion ? "3.4.0.GA"
|
||||
, rename ? false
|
||||
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
|
||||
@ -18,7 +19,7 @@ rec {
|
||||
in
|
||||
import ./kitchensink {
|
||||
inherit (pkgs) fetchgit;
|
||||
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
|
||||
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
|
||||
inherit tiVersion;
|
||||
target = "android";
|
||||
});
|
||||
@ -29,7 +30,7 @@ rec {
|
||||
in
|
||||
import ./kitchensink {
|
||||
inherit (pkgs) fetchgit;
|
||||
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
|
||||
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
|
||||
inherit tiVersion;
|
||||
target = "android";
|
||||
release = true;
|
||||
@ -60,21 +61,21 @@ rec {
|
||||
rec {
|
||||
kitchensink_ios_development = import ./kitchensink {
|
||||
inherit (pkgs) fetchgit;
|
||||
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
|
||||
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
|
||||
inherit tiVersion;
|
||||
target = "iphone";
|
||||
};
|
||||
|
||||
simulate_kitchensink_iphone = import ./simulate-kitchensink {
|
||||
inherit (pkgs) stdenv;
|
||||
xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; };
|
||||
xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; };
|
||||
kitchensink = kitchensink_ios_development;
|
||||
device = "iPhone";
|
||||
};
|
||||
|
||||
simulate_kitchensink_ipad = import ./simulate-kitchensink {
|
||||
inherit (pkgs) stdenv;
|
||||
xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; };
|
||||
xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; };
|
||||
kitchensink = kitchensink_ios_development;
|
||||
device = "iPad";
|
||||
};
|
||||
@ -85,7 +86,7 @@ rec {
|
||||
{
|
||||
kitchensink_ipa = import ./kitchensink {
|
||||
inherit (pkgs) stdenv fetchgit;
|
||||
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
|
||||
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; };
|
||||
target = "iphone";
|
||||
inherit tiVersion;
|
||||
release = true;
|
||||
|
Loading…
Reference in New Issue
Block a user