nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Griffin Smith 2020-03-30 16:42:55 -04:00
parent 8b018a3fd4
commit 84f720d9a4
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
; # 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.