Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 63aed85367d6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 81f78e6d3dd5
Choose a head ref
  • 4 commits
  • 24 files changed
  • 1 contributor

Commits on Jul 9, 2018

  1. xcbuild: refactor 

    This reworks some of xcbuild logic to make it more compatible with
Apple’s SDK.

- Add a fake version of xcrun & xcode-select
- Cleanup platform generation. Clang does not like having 20 char
  hashes in sysroot so it is much easier to just build the parent
  directory for each runCommand. This is a little awkward but I have
  renamed everything with an added ‘s’ to make the distinction more clear.
- Cleaned up wrapper.nix in some different ways
- Reuse some versioning logic so that we don’t end up with two
  different versions of Xcode or SDK reported.
    @matthewbauer
    matthewbauer committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    35b2c0e View commit details
    Browse the repository at this point in the history

  2. xcbuild: move setup hook to xcbuildHook 

    Not every package that needs xcbuild will want to use its build phase.
I have moved the xcbuild setup hook to the new attribute xcbuildHook.
This means that dontUseXcbuild is no longer needed. If you just need
to call xcbuild on its own you can just refer to xcbuild.
    @matthewbauer
    matthewbauer committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    0534cea View commit details
    Browse the repository at this point in the history

  3. xcbuild: add alias 

    You can now refer to it as xcodebuild. This is meant to be more
discoverable for not familiar with xcbuild. xcodebuild should work in
the same way as the xcodebuild that comes with Xcode.app, but it is
built entirely with free software.
    @matthewbauer
    matthewbauer committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    2621171 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #43256 from matthewbauer/xcbuild-refactor 

    xcbuild refactor
    @matthewbauer
    matthewbauer committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    81f78e6 View commit details
    Browse the repository at this point in the history