diff options
| author | Sander van der Burg <sander@conference-compass.com> | 2013-08-16 13:20:59 +0200 |
|---|---|---|
| committer | Sander van der Burg <sander@conference-compass.com> | 2013-08-16 13:20:59 +0200 |
| commit | bf1c37494eccdcb9e40e8d4a0d6154d6b6dc0e18 (patch) | |
| tree | f153e9121e45655e1c01ec1eef0bf9bba164a30a /pkgs/development/mobile | |
| parent | 5cb688eb52d680d22be2b4f84827eb80afd957e3 (diff) | |
| download | nixpkgs-bf1c37494eccdcb9e40e8d4a0d6154d6b6dc0e18.tar nixpkgs-bf1c37494eccdcb9e40e8d4a0d6154d6b6dc0e18.tar.gz nixpkgs-bf1c37494eccdcb9e40e8d4a0d6154d6b6dc0e18.tar.bz2 nixpkgs-bf1c37494eccdcb9e40e8d4a0d6154d6b6dc0e18.tar.lz nixpkgs-bf1c37494eccdcb9e40e8d4a0d6154d6b6dc0e18.tar.xz nixpkgs-bf1c37494eccdcb9e40e8d4a0d6154d6b6dc0e18.tar.zst nixpkgs-bf1c37494eccdcb9e40e8d4a0d6154d6b6dc0e18.zip | |
Moved reference to iPhone SDKs to the wrapper that proxies to Xcode
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/xcodeenv/simulate-app.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/mobile/xcodeenv/xcodewrapper.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 03ed90c40d5..7c98ce76a1a 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,7 +1,6 @@ {stdenv, xcodewrapper}: { name, appName ? null, app , device ? "iPhone", baseDir ? "" -, sdkRoot ? "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" , sdkVersion ? "6.1" }: @@ -16,7 +15,7 @@ stdenv.mkDerivation { #! ${stdenv.shell} -e cd "${app}/${baseDir}/${_appName}.app" - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot '${sdkRoot}/iPhoneSimulator${sdkVersion}.sdk' + "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot "$(readlink "${xcodewrapper}/SDKs")/iPhoneSimulator${sdkVersion}.sdk" EOF chmod +x $out/bin/run-test-simulator ''; diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 77d2c4c867e..1cbab99e365 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation { ln -s /usr/bin/security ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator" + cd .. + ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" + # Check if we have the xcodebuild version that we want if [ -z "$($out/bin/xcodebuild -version | grep ${version})" ] then |