diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/cairo/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index 2bd35f32610d..149ac5490461 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -3,7 +3,8 @@ , freetypeSupport ? true, freetype , fontconfigSupport ? freetypeSupport, fontconfig , gobjectSupport ? true, glib -, xlibXrenderSupport ? true +, xlibSupport ? true +, xlibXrenderSupport ? xlibSupport , xcbSupport ? true # no longer experimental since 1.12 , libGLSupported , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) @@ -13,6 +14,7 @@ }: assert fontconfigSupport -> freetypeSupport; +assert xlibXrenderSupport -> xlibSupport; assert glSupport -> libGL != null; let @@ -39,6 +41,8 @@ in stdenv.mkDerivation rec { }) ./0001-test-don-t-always-build-FreeType-dependent-test.patch + ./0002-gl-don-t-implicitly-include-X11-headers.patch + ./0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch ]; outputs = [ "out" "dev" "devdoc" ]; @@ -60,7 +64,8 @@ in stdenv.mkDerivation rec { ]); propagatedBuildInputs = - with xorg; [ libX11 libXext expat pixman zlib libpng ] + with xorg; [ expat pixman zlib libpng ] + ++ optionals xlibSupport [ libX11 libXext ] ++ optional xlibXrenderSupport libXrender ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional freetypeSupport freetype |