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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8a6ea516140
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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

    Verified

    This commit was signed with the committer’s verified signature.
    Lucus16 Lars Jellema
    GPG key ID: 563A03936D48B4BC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    84f720d View commit details

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 authored Apr 14, 2020
    Copy the full SHA
    46bf4cb View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/libraries/cairo/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/cairo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
++ optional glSupport libGL
; # TODO: maybe liblzo but what would it be for here?

configureFlags = if stdenv.isDarwin then [
configureFlags = (if stdenv.isDarwin then [
"--disable-dependency-tracking"
"--enable-quartz"
"--enable-quartz-font"
@@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
++ optional xcbSupport "--enable-xcb"
++ optional glSupport "--enable-gl"
++ optional pdfSupport "--enable-pdf"
);
)) ++ optional (!x11Support) "--disable-xlib";

preConfigure =
# On FreeBSD, `-ldl' doesn't exist.