diff options
author | Sander van der Burg <svanderburg@gmail.com> | 2016-01-07 14:43:17 +0000 |
---|---|---|
committer | Sander van der Burg <svanderburg@gmail.com> | 2016-01-07 14:43:17 +0000 |
commit | b6d84748b913c9ffc9937ec64ca868cffa8797b4 (patch) | |
tree | a0673cc9a565d91939d80cadf8da08132e2f2ca8 /pkgs/development/mobile/xcodeenv | |
parent | 326dce47d39120ab108c8a032ff9c694a65549e7 (diff) | |
download | nixpkgs-b6d84748b913c9ffc9937ec64ca868cffa8797b4.tar nixpkgs-b6d84748b913c9ffc9937ec64ca868cffa8797b4.tar.gz nixpkgs-b6d84748b913c9ffc9937ec64ca868cffa8797b4.tar.bz2 nixpkgs-b6d84748b913c9ffc9937ec64ca868cffa8797b4.tar.lz nixpkgs-b6d84748b913c9ffc9937ec64ca868cffa8797b4.tar.xz nixpkgs-b6d84748b913c9ffc9937ec64ca868cffa8797b4.tar.zst nixpkgs-b6d84748b913c9ffc9937ec64ca868cffa8797b4.zip |
xcodeenv: make it work with xcode 7.2
Diffstat (limited to 'pkgs/development/mobile/xcodeenv')
-rw-r--r-- | pkgs/development/mobile/xcodeenv/build-app.nix | 4 | ||||
-rw-r--r-- | pkgs/development/mobile/xcodeenv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/xcodeenv/simulate-app.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/xcodeenv/xcodewrapper.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 6af32ba4198..b2e6f84bb00 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -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 '' diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index d1647324865..d7e35142be4 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -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 { diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 645bcd69da0..ecfdbe2a6e3 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -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) diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 4be204d5dc5..26b0197b2e1 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -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" |