about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/cairo
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-04-22 15:33:33 +0000
committerAlyssa Ross <hi@alyssa.is>2019-04-23 10:12:02 +0000
commit684bf817e76b76e543d8772e3ea21214f1ac9504 (patch)
tree1248e52e419fa3e4074621e44f7546afeb08ee25 /nixpkgs/pkgs/development/libraries/cairo
parent929854bd47bfcd2d7112ab1c0ed1a295af3fc7cc (diff)
downloadnixlib-684bf817e76b76e543d8772e3ea21214f1ac9504.tar
nixlib-684bf817e76b76e543d8772e3ea21214f1ac9504.tar.gz
nixlib-684bf817e76b76e543d8772e3ea21214f1ac9504.tar.bz2
nixlib-684bf817e76b76e543d8772e3ea21214f1ac9504.tar.lz
nixlib-684bf817e76b76e543d8772e3ea21214f1ac9504.tar.xz
nixlib-684bf817e76b76e543d8772e3ea21214f1ac9504.tar.zst
nixlib-684bf817e76b76e543d8772e3ea21214f1ac9504.zip
cairo: make fontconfig support optional
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo')
-rw-r--r--nixpkgs/pkgs/development/libraries/cairo/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix
index a761b8bd3f22..9cc38d710fca 100644
--- a/nixpkgs/pkgs/development/libraries/cairo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix
@@ -1,5 +1,6 @@
 { config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv
-, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
+, libintl, expat, zlib, libpng, pixman, freetype, xorg
+, fontconfigSupport ? true, fontconfig
 , gobjectSupport ? true, glib
 , xcbSupport ? true # no longer experimental since 1.12
 , libGLSupported
@@ -53,8 +54,9 @@ in stdenv.mkDerivation rec {
   ]);
 
   propagatedBuildInputs =
-    with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ]
+    with xorg; [ libXext expat freetype pixman zlib libpng libXrender ]
     ++ optionals xcbSupport [ libxcb xcbutil ]
+    ++ optional fontconfigSupport fontconfig
     ++ optional gobjectSupport glib
     ++ optional glSupport libGL
     ; # TODO: maybe liblzo but what would it be for here?