diff options
| author | Sander van der Burg <sander@conference-compass.com> | 2013-07-15 11:32:12 +0200 |
|---|---|---|
| committer | Sander van der Burg <sander@conference-compass.com> | 2013-07-15 11:32:12 +0200 |
| commit | 41932dd1357619c82249fc0b78a417262015a34a (patch) | |
| tree | 6e94c6fc5460f2cdf97bd9c10dc93f973091a7e6 /pkgs/development/mobile | |
| parent | ac1803f42494811072983e55cc6ccb24a5f981f2 (diff) | |
| download | nixlib-41932dd1357619c82249fc0b78a417262015a34a.tar nixlib-41932dd1357619c82249fc0b78a417262015a34a.tar.gz nixlib-41932dd1357619c82249fc0b78a417262015a34a.tar.bz2 nixlib-41932dd1357619c82249fc0b78a417262015a34a.tar.lz nixlib-41932dd1357619c82249fc0b78a417262015a34a.tar.xz nixlib-41932dd1357619c82249fc0b78a417262015a34a.tar.zst nixlib-41932dd1357619c82249fc0b78a417262015a34a.zip | |
Do not make assumptions on the scheme name, but let xcodebuild decide about it
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/xcodeenv/build-app.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index ac6bbc7f282d..ade629759f09 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -23,7 +23,6 @@ let # Set some default values here _target = if target == null then name else target; - _scheme = if scheme == null then name else scheme; _configuration = if configuration == null then @@ -75,7 +74,7 @@ stdenv.mkDerivation { ''} # Do the building - xcodebuild -target ${_target} -configuration ${_configuration} -scheme ${_scheme} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""} + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""} ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' |