public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
cairo: pass --disable-xlib to config if no x11
This commit is contained in:
worldofpeace 2020-04-14 09:13:36 -04:00 committed by GitHub
commit 46bf4cb283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/cairo/default.nix
View File

@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
++ optional glSupport libGL ++ optional glSupport libGL
; # TODO: maybe liblzo but what would it be for here? ; # TODO: maybe liblzo but what would it be for here?
configureFlags = if stdenv.isDarwin then [ configureFlags = (if stdenv.isDarwin then [
"--disable-dependency-tracking" "--disable-dependency-tracking"
"--enable-quartz" "--enable-quartz"
"--enable-quartz-font" "--enable-quartz-font"
@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
++ optional xcbSupport "--enable-xcb" ++ optional xcbSupport "--enable-xcb"
++ optional glSupport "--enable-gl" ++ optional glSupport "--enable-gl"
++ optional pdfSupport "--enable-pdf" ++ optional pdfSupport "--enable-pdf"
); )) ++ optional (!x11Support) "--disable-xlib";
preConfigure = preConfigure =
# On FreeBSD, `-ldl' doesn't exist. # On FreeBSD, `-ldl' doesn't exist.