Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

iOS with xcode 11 cherry pick for 19.09 #76070

Conversation

@matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Dec 19, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@matthewbauer matthewbauer requested a review from basvandijk as a code owner Dec 19, 2019
@matthewbauer matthewbauer changed the title Ios with xcode 11 cherry pick for 1909 iOS with xcode 11 cherry pick for 19.09 Dec 19, 2019
@@ -10,7 +10,7 @@
, # GHC can be built with system libffi or a bundled one.
libffi ? null

, useLLVM ? !stdenv.targetPlatform.isx86
, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) || stdenv.targetPlatform.isiOS

This comment has been minimized.

@cdepillabout

cdepillabout Dec 20, 2019
Member

It looks like you just copied this line from the 8.4.4.nix, but if you know why stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform is needed, it'd be really great to have a comment here.

Why is LLVM needed only when we're cross-compiling to musl?

This comment has been minimized.

@matthewbauer

matthewbauer Jan 3, 2020
Author Member

That was an oversight from rebasing, remove it now.

@matthewbauer matthewbauer force-pushed the matthewbauer:ios-with-xcode-11-cherry-pick-for-1909 branch from e7856c8 to a10ffa5 Jan 3, 2020
Ericson2314 and others added 3 commits Oct 15, 2019
Apple no longer ships with it, so best to avoid forcing it into use.
Even when building for the simulator.
@matthewbauer matthewbauer force-pushed the matthewbauer:ios-with-xcode-11-cherry-pick-for-1909 branch from a10ffa5 to 036cef9 Jan 3, 2020
@matthewbauer matthewbauer merged commit 2d94547 into NixOS:release-19.09 Jan 3, 2020
1 check was pending
1 check was pending
grahamcofborg-eval Checking original out paths
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.