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: bb321a2624ab
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1e1221c1c151
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 30, 2018

  1. opencolorio: refactor to use system lcms2 and tinyxml 

    The version of LCMS bundled with opencolorio is too old to build on
aarch64, simply because its config files date from before aarch64
was announced. However, it can use the system lcms2 if it is found.

Also de-vendor tinyxml.

In addition, the version had been bumped to 1.1.0, but 1.0.9 was still
hard-coded in the fetch uri. Some changes were necessary for 1.1.0 to build.

As the sources are fetched from github, use fetchFromGitHub instead of
fetchurl.
    @Thra11
    Thra11 committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    43110d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2018

  1. Merge pull request #45682 from Thra11/opencolorio-system-lcms 

    opencolorio: use system lcms2 on aarch64
    @jtojnar
    jtojnar committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    1e1221c View commit details
    Browse the repository at this point in the history