Merge pull request #83808 from glittershark/fix-cairo-no-xlib
cairo: pass --disable-xlib to config if no x11
This commit is contained in:
commit
46bf4cb283
1 changed files with 2 additions and 2 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue