about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/cairo/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo/default.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/cairo/default.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix
index 9cc38d710fca..d5fbf5787051 100644
--- a/nixpkgs/pkgs/development/libraries/cairo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix
@@ -1,6 +1,7 @@
-{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv
-, libintl, expat, zlib, libpng, pixman, freetype, xorg
-, fontconfigSupport ? true, fontconfig
+{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, autoreconfHook
+, libintl, expat, zlib, libpng, pixman, xorg
+, freetypeSupport ? true, freetype
+, fontconfigSupport ? freetypeSupport, fontconfig
 , gobjectSupport ? true, glib
 , xcbSupport ? true # no longer experimental since 1.12
 , libGLSupported
@@ -10,6 +11,7 @@
 , darwin
 }:
 
+assert fontconfigSupport -> freetypeSupport;
 assert glSupport -> libGL != null;
 
 let
@@ -34,12 +36,15 @@ in stdenv.mkDerivation rec {
       url    = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch";
       sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1";
     })
+
+    ./0001-test-don-t-always-build-FreeType-dependent-test.patch
   ];
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev"; # very small
 
   nativeBuildInputs = [
+    autoreconfHook
     pkgconfig
   ];
 
@@ -54,8 +59,9 @@ in stdenv.mkDerivation rec {
   ]);
 
   propagatedBuildInputs =
-    with xorg; [ libXext expat freetype pixman zlib libpng libXrender ]
+    with xorg; [ libXext expat pixman zlib libpng libXrender ]
     ++ optionals xcbSupport [ libxcb xcbutil ]
+    ++ optional freetypeSupport freetype
     ++ optional fontconfigSupport fontconfig
     ++ optional gobjectSupport glib
     ++ optional glSupport libGL