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

xcodeenv: make it work with xcode 7.2

Browse Source
This commit is contained in:
Sander van der Burg 2016-01-07 14:43:17 +00:00
parent 326dce47d3
commit b6d84748b9
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/mobile/xcodeenv/build-app.nix
View File

@ -37,7 +37,7 @@ let
_arch = if arch == null
then
if release then "armv7" else "i386"
if release then "armv7" else "x86_64"
else arch;
_sdk = if sdk == null
@ -83,7 +83,7 @@ stdenv.mkDerivation {
''}
# Do the building
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 ""}
xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO VALID_ARCHS="${_arch}" 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 ''

2
pkgs/development/mobile/xcodeenv/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, version ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
{stdenv, version ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app"}:
rec {
xcodewrapper = import ./xcodewrapper.nix {

2
pkgs/development/mobile/xcodeenv/simulate-app.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
fi
# Open the simulator instance
open -a "$(readlink "${xcodewrapper}/bin/iOS Simulator")" --args -CurrentDeviceUDID $udid
open -a "$(readlink "${xcodewrapper}/bin/Simulator")" --args -CurrentDeviceUDID $udid
# Copy the app and restore the write permissions
appTmpDir=$(mktemp -d -t appTmpDir)

2
pkgs/development/mobile/xcodeenv/xcodewrapper.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
ln -s /usr/bin/codesign
ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcrun"
ln -s "${xcodeBaseDir}/Contents/Developer/Applications/iOS Simulator.app/Contents/MacOS/iOS Simulator"
ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator"
cd ..
ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"