ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 14:19:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #204278 from status-im/xcode-allow-higher

Browse Source 
xcodeenv: allow versions higher than specified
This commit is contained in:
Dmitry Kalinkin 2023-04-27 14:44:08 -04:00 committed by GitHub
commit 2c7d57db4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
View File

@ -1,10 +1,13 @@
{stdenv}:
{version ? "11.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
{ stdenv, lib }:
{ version ? "11.1"
, allowHigher ? false
, xcodeBaseDir ? "/Applications/Xcode.app" }:
assert stdenv.isDarwin;
stdenv.mkDerivation {
name = "xcode-wrapper-"+version;
pname = "xcode-wrapper${lib.optionalString allowHigher "-plus"}";
inherit version;
buildCommand = ''
mkdir -p $out/bin
cd $out/bin
@ -24,9 +27,15 @@ stdenv.mkDerivation {
ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
# Check if we have the xcodebuild version that we want
if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ]
currVer=$($out/bin/xcodebuild -version | head -n1)
${if allowHigher then ''
if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ]
'' else ''
if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ]
''}
then
echo "We require xcodebuild version: ${version}"
echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}"
echo "Instead what was found: $currVer"
exit 1
fi
'';

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

@ -1,15 +1,9 @@
{ stdenv, lib }:
{ callPackage }:
rec {
composeXcodeWrapper = import ./compose-xcodewrapper.nix {
inherit stdenv;
};
composeXcodeWrapper = callPackage ./compose-xcodewrapper.nix { };
buildApp = import ./build-app.nix {
inherit stdenv lib composeXcodeWrapper;
};
buildApp = callPackage ./build-app.nix { inherit composeXcodeWrapper; };
simulateApp = import ./simulate-app.nix {
inherit stdenv lib composeXcodeWrapper;
};
simulateApp = callPackage ./simulate-app.nix { inherit composeXcodeWrapper; };
}