diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2013-12-24 14:34:56 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2013-12-24 14:34:56 +0100 |
| commit | 2f624cd1fad832cdf852edeeb4033bb24b97807b (patch) | |
| tree | 4306fbe65d33dbc66133950880b9ea32ddee3e2e /pkgs/development/mobile/xcodeenv | |
| parent | 94536ea09fbec5415bdd31cff6b271d8d764eae5 (diff) | |
Make xcode detection a bit more robust and configurable
Diffstat (limited to 'pkgs/development/mobile/xcodeenv')
| -rw-r--r-- | pkgs/development/mobile/xcodeenv/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/mobile/xcodeenv/xcodewrapper.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index 7f834688e636..ad6569d94783 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,8 +1,8 @@ -{stdenv}: +{stdenv, version ? "5.0"}: rec { xcodewrapper = import ./xcodewrapper.nix { - inherit stdenv; + inherit stdenv version; }; buildApp = import ./build-app.nix { diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 7515fcdd121f..71e34ee5127d 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -1,4 +1,4 @@ -{stdenv, version ? "5.0"}: +{stdenv, version}: stdenv.mkDerivation { name = "xcode-wrapper-"+version; @@ -16,7 +16,7 @@ stdenv.mkDerivation { 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})" ] + if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ] then echo "We require xcodebuild version: ${version}" exit 1 |