diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
| commit | 0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea (patch) | |
| tree | ad528e0ffd64d471f2bf250670c0732bff57e86b /nixpkgs/pkgs/development/libraries/cairo | |
| parent | 373507e28edeacd168b5c240840db2dac854882a (diff) | |
| parent | 2ec5e9595becf05b052ce4c61a05d87ce95d19af (diff) | |
| download | nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.gz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.bz2 nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.lz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.xz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.zst nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.zip | |
Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/cairo/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index ec48a5a1ae46..c81b5ba57ad9 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -1,13 +1,13 @@ { config, stdenv, lib, fetchurl, fetchpatch, pkgconfig, autoreconfHook -, pixman, xorg +, pixman , zlibSupport ? true, zlib , pngSupport ? true, libpng , freetypeSupport ? true, freetype , fontconfigSupport ? freetypeSupport, fontconfig , gobjectSupport ? true, glib -, xlibSupport ? true -, xlibXrenderSupport ? xlibSupport -, xcbSupport ? true # no longer experimental since 1.12 +, x11Support ? !stdenv.isDarwin, libX11, libXext +, x11XrenderSupport ? x11Support, libXrender +, xcbSupport ? !stdenv.isDarwin, libxcb # no longer experimental since 1.12 , libGLSupported , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) , libGL ? null # libGLU_combined is no longer a big dependency @@ -15,7 +15,7 @@ }: assert fontconfigSupport -> freetypeSupport; -assert xlibXrenderSupport -> xlibSupport; +assert x11XrenderSupport -> x11Support; assert glSupport -> libGL != null; let @@ -67,9 +67,9 @@ in stdenv.mkDerivation rec { [ pixman ] ++ optional zlibSupport zlib ++ optional pngSupport libpng - ++ optionals xlibSupport (with xorg; [ libX11 libXext ]) - ++ optional xlibXrenderSupport xorg.libXrender - ++ optional xcbSupport xorg.libxcb + ++ optionals x11Support [ libX11 libXext ] + ++ optional x11XrenderSupport libXrender + ++ optional xcbSupport libxcb ++ optional freetypeSupport freetype ++ optional fontconfigSupport fontconfig ++ optional gobjectSupport glib |