Skip to content

Commit

Permalink
nix: allow XCode versions 11.5 and higher
Browse files Browse the repository at this point in the history
This is kinda hacky, but is simple enough since the version check uses grep.

For details see:
https://github.com/status-im/nixpkgs/blob/status-mods/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix

Signed-off-by: Jakub Sokołowski <jakub@status.im>
  • Loading branch information
jakubgs committed Jul 30, 2020
1 parent 8652f89 commit f9de5e6
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ in {
gradlePropParser = callPackage ./tools/gradlePropParser.nix { };

# Package version adjustments
xcodeWrapper = super.xcodeenv.composeXcodeWrapper { version = "11.5"; };
openjdk = super.pkgs.openjdk8_headless;
nodejs = super.pkgs.nodejs-12_x;
openjdk = super.pkgs.openjdk8_headless;
xcodeWrapper = super.xcodeenv.composeXcodeWrapper {
version = "11\.[5-9]\+\.\?[0-9]\?\+"; # uses grep
};

# Android environement
androidEnvCustom = callPackage ./pkgs/android-sdk { };
Expand Down

0 comments on commit f9de5e6

Please sign in to comment.