git.iko.soy/typeable/nixpkgs
on master help sign in
cairo: make OpenGL support require X11

If OpenGL is enabled without X11, the build fails with: In file included from /nix/store/<...>-libglvnd-1.3.1-dev/include/EGL/egl.h:39, from cairo-gl.h:130, from cairo-gl-private.h:51, from cairo-gl-composite.c:48: /nix/store/<...>-libglvnd-1.3.1-dev/include/EGL/eglplatform.h:128:10: fatal error: X11/Xlib.h: No such file or directory 128 | #include <X11/Xlib.h> | ^~~~~~~~~~~~ compilation terminated.

commit98be04b83aece31412834cb768529d86a348946a authorBen Wolsieffer <benwolsieffer@gmail.com> dateSat 1 Aug 2020, 17:00 (6 years ago) parent7802608
1 file changed+2−2
pkgs/development/libraries/cairo/default.nix+2−2
pkgs/development/libraries/cairo/default.nix+2−2
@@ -4,13 +4,13 @@
44, gobjectSupport ? true, glib
55, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
66, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
7−, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux)
7+, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux)
88, libGL ? null # libGLU libGL is no longer a big dependency
99, pdfSupport ? true
1010, darwin
1111}:
1212
13−assert glSupport -> libGL != null;
13+assert glSupport -> x11Support && libGL != null;
1414
1515let
1616 version = "1.16.0";