titaniumenv: Make path to xcode configurable through the build function

This commit is contained in:
Sander van der Burg 2014-10-14 14:57:11 +02:00
parent e3563e6c23
commit 2375a55e1e
2 changed files with 9 additions and 3 deletions

View file

@ -1,4 +1,4 @@
{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which}:
{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}:
{ name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null
@ -101,7 +101,10 @@ stdenv.mkDerivation {
cat > $HOME/.titanium/auth_session.json <<EOF
{ "loggedIn": true }
EOF
# Configure the path to Xcode
titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
# Set the SDK to our copy
titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation $TMPDIR/titaniumsdk
@ -122,6 +125,9 @@ stdenv.mkDerivation {
cp -av * $out
cd $out
# Configure the path to Xcode
titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --output-dir $out
''}
''

View file

@ -47,6 +47,6 @@ rec {
inherit (pkgs.nodePackages) titanium;
inherit (androidenv) androidsdk;
inherit (xcodeenv) xcodewrapper;
inherit titaniumsdk;
inherit titaniumsdk xcodeBaseDir;
};
}