diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/cairo/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index cb93b224df40..a0d4eccae943 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -1,7 +1,7 @@ -{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, autoreconfHook -, libintl, expat, zlib, libpng, pixman, xorg -, zlibSupport ? true -, pngSupport ? true +{ config, stdenv, fetchurl, fetchpatch, pkgconfig, autoreconfHook +, pixman, xorg +, zlibSupport ? true, zlib +, pngSupport ? true, libpng , freetypeSupport ? true, freetype , fontconfigSupport ? freetypeSupport, fontconfig , gobjectSupport ? true, glib @@ -53,12 +53,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig + autoreconfHook ]; - buildInputs = [ - libiconv - libintl - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText ApplicationServices @@ -66,12 +64,12 @@ in stdenv.mkDerivation rec { ]); propagatedBuildInputs = - with xorg; [ expat pixman ] + with xorg; [ pixman ] ++ optional zlibSupport zlib ++ optional pngSupport libpng ++ optionals xlibSupport [ libX11 libXext ] ++ optional xlibXrenderSupport libXrender - ++ optionals xcbSupport [ libxcb xcbutil ] + ++ optional xcbSupport xorg.libxcb ++ optional freetypeSupport freetype ++ optional fontconfigSupport fontconfig ++ optional gobjectSupport glib |