diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2013-01-20 16:53:21 +0100 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2013-01-20 16:53:21 +0100 |
| commit | 1886d1db6a962578bd802e820a1279b4aed3333a (patch) | |
| tree | 4b938608821b25f0b972c80a837b8f8f35becc1f /pkgs/development/mobile | |
| parent | d1c548cdd728961350f6ee4a65d597df3b1ebe61 (diff) | |
| parent | e185691ced86fc517a2daea762d7d11e525c6ae8 (diff) | |
| download | nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.gz nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.bz2 nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.lz nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.xz nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.zst nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.zip | |
Merge remote-tracking branch 'upstream/master' into stdenv-updates
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/build-app.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 5a06e809c3d3..c675116f88aa 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -16,7 +16,8 @@ let deleteKeychain = "security delete-keychain $keychainName"; in stdenv.mkDerivation { - inherit name src; + name = stdenv.lib.replaceChars [" "] [""] name; + inherit src; buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; @@ -27,9 +28,9 @@ stdenv.mkDerivation { ${if target == "android" then if release then - "${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out" + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out'' else - "${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}" + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}'' else if target == "iphone" then if iosDistribute then '' @@ -52,7 +53,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -80,7 +81,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -95,7 +96,7 @@ stdenv.mkDerivation { cp -av * $out cd $out - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} ${name} + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" '' else throw "Target: ${target} is not supported!"} |