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

cairo: make x11 optional, disabled on darwin

Browse Source
This commit is contained in:
Jorge Acereda 2019-04-16 22:56:48 +02:00 committed by Frederik Rietdijk
parent bd878ef083
commit b7a41a280f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv { config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv
, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , libintl, expat, zlib, libpng, pixman, fontconfig, freetype
, x11Support? !stdenv.isDarwin, libXext, libXrender
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12 , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
, libGLSupported , libGLSupported
, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips)
, libGL ? null # libGLU_combined is no longer a big dependency , libGL ? null # libGLU_combined is no longer a big dependency
@ -52,8 +53,8 @@ in stdenv.mkDerivation rec {
Carbon Carbon
]); ]);
propagatedBuildInputs = propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ]
with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ] ++ optionals x11Support [ libXext libXrender ]
++ optionals xcbSupport [ libxcb xcbutil ] ++ optionals xcbSupport [ libxcb xcbutil ]
++ optional gobjectSupport glib ++ optional gobjectSupport glib
++ optional glSupport libGL ++ optional glSupport libGL