mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 13:57:10 +03:00
Make xcode detection a bit more robust and configurable
This commit is contained in:
parent
94536ea09f
commit
2f624cd1fa
@ -1,8 +1,8 @@
|
||||
{stdenv}:
|
||||
{stdenv, version ? "5.0"}:
|
||||
|
||||
rec {
|
||||
xcodewrapper = import ./xcodewrapper.nix {
|
||||
inherit stdenv;
|
||||
inherit stdenv version;
|
||||
};
|
||||
|
||||
buildApp = import ./build-app.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
|
||||
|
Loading…
Reference in New Issue
Block a user