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

Commits on Mar 30, 2020

  1. cairo: pass --disable-xlib to config if no x11 

    It appears that cairo's configure script, at least on MacOS but perhaps
elsewhere, unconditionally enables xlib support, even if the library
isn't present, which breaks the build on MacOS always (since x11 is
disabled by default now). This explicitly passes `--disable-x11` if
x11Support is set to false, which fixes the build for me.
    @glittershark
    glittershark committed Mar 30, 2020
    Copy the full SHA
    84f720d View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2020

  1. Merge pull request #83808 from glittershark/fix-cairo-no-xlib 

    cairo: pass --disable-xlib to config if no x11
    @worldofpeace
    worldofpeace committed Apr 14, 2020
    Copy the full SHA
    46bf4cb View commit details
    Browse the repository at this point in the history